This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch, release/2.10/master, updated. glibc-2.10.1-100-gdacc52e
- From: schwab at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 17 Nov 2009 10:46:15 -0000
- Subject: GNU C Library master sources branch, release/2.10/master, updated. glibc-2.10.1-100-gdacc52e
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, release/2.10/master has been updated
via dacc52e1922491a3b0e613a8be2d488871315114 (commit)
via 56ddc4bb74c8ab22c93f6e1a75d93afd9782ebce (commit)
from 6c7deb9def4134856b0aded540bfe2eec9fded4b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=dacc52e1922491a3b0e613a8be2d488871315114
commit dacc52e1922491a3b0e613a8be2d488871315114
Author: Andreas Schwab <schwab@redhat.com>
Date: Mon Nov 16 17:59:45 2009 +0100
glibc 2.10.2 release
diff --git a/version.h b/version.h
index f169c6a..9b5ac9a 100644
--- a/version.h
+++ b/version.h
@@ -1,4 +1,4 @@
/* This file just defines the current version number of libc. */
#define RELEASE "stable"
-#define VERSION "2.10.1"
+#define VERSION "2.10.2"
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=56ddc4bb74c8ab22c93f6e1a75d93afd9782ebce
commit 56ddc4bb74c8ab22c93f6e1a75d93afd9782ebce
Author: Roland McGrath <roland@redhat.com>
Date: Wed Oct 28 15:27:43 2009 -0700
New simplified make dist using git archive.
(cherry picked from commit 6cfe8609b890f33e6c7235549cb02c3c6a0f3820)
diff --git a/ChangeLog b/ChangeLog
index b46fed2..ceaf5fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2009-10-28 Roland McGrath <roland@redhat.com>
+
+ * Makefile (dist-prepare): New target.
+ (tag-for-dist): Target removed.
+ (glibc-%.tar): Pattern rule removed.
+ (%.tar): New pattern rule, does simple use of git archive.
+ (dist-version): Remove variable definition.
+ (dist): Just depend on that. Add .tar.xz dependency.
+ If dist-version variable not set on command line, depend on
+ dist-prepare, re-invoke with dist-version set via git describe.
+
+ * Makerules (%.xz): New pattern rule.
+
2009-11-03 Andreas Schwab <schwab@redhat.com>
* sysdeps/unix/sysv/linux/powerpc/powerpc32/syscalls.list: Add
diff --git a/Makefile b/Makefile
index cab5ff3..3908049 100644
--- a/Makefile
+++ b/Makefile
@@ -347,51 +347,38 @@ TAGS:
| $(ETAGS) -o $@ -
# Make the distribution tarfile.
-.PHONY: dist tag-for-dist
+.PHONY: dist dist-prepare
generated := $(generated) stubs.h
-files-for-dist := README FAQ INSTALL NOTES configure
-
-tag-of-stem = glibc-$(subst .,_,$*)
-dist-selector = -r $(tag-of-stem)
-
-# Add-ons in the main repository but distributed in their own tar files.
-dist-separate = libidn
-
-glibc-%.tar $(dist-separate:%=glibc-%-%.tar): $(files-for-dist) \
- $(foreach D,$(dist-separate),\
- $D/configure)
- @rm -fr glibc-$*
- $(MAKE) -q `find sysdeps $(addsuffix /sysdeps,$(sysdeps-add-ons)) \
- -name configure`
- cvs $(CVSOPTS) -Q export -d glibc-$* $(dist-selector) libc
-# Touch all the configure scripts going into the tarball since cvs export
-# might have delivered configure.in newer than configure.
- find glibc-$* -name configure -print | xargs touch
- $(dist-do-separate-dirs)
- tar cf glibc-$*.tar glibc-$*
- rm -fr glibc-$*
-define dist-do-separate-dirs
-$(foreach dir,$(dist-separate),
- @rm -fr glibc-$(dir)-$*
- mv glibc-$*/$(dir) glibc-$(dir)-$*
- tar cf glibc-$(dir)-$*.tar glibc-$(dir)-$*
- rm -fr glibc-$(dir)-$*
-)
-endef
+files-for-dist := README FAQ INSTALL NOTES configure ChangeLog NEWS
+
+# Regenerate stuff, then error if these things are not committed yet.
+dist-prepare: $(files-for-dist)
+ conf=`find sysdeps $(addsuffix /sysdeps,$(sysdeps-add-ons)) \
+ -name configure`; \
+ $(MAKE) $$conf && \
+ git diff --stat HEAD -- $^ $$conf \
+ | $(AWK) '{ print; rc=1 } END { exit rc }'
+
+%.tar: FORCE
+ git archive --prefix=$*/ $* > $@.new
+ mv -f $@.new $@
# Do `make dist dist-version=X.Y.Z' to make tar files of an older version.
-dist-version = $(version)
-dist: $(foreach Z,.bz2 .gz,glibc-$(dist-version).tar$Z \
- $(foreach D,$(dist-separate),\
- glibc-$D-$(dist-version).tar$Z))
+ifneq (,$(strip $(dist-version)))
+dist: $(foreach Z,.bz2 .gz .xz,$(dist-version).tar$Z)
md5sum $^
-
-tag-for-dist: tag-$(dist-version)
-tag-%: $(files-for-dist)
- cvs $(CVSOPTS) -Q tag -c $(tag-of-stem)
+else
+dist: dist-prepare
+ @if v=`git describe`; then \
+ echo Distribution version $$v; \
+ $(MAKE) dist dist-version=$$v; \
+ else \
+ false; \
+ fi
+endif
define format-me
@rm -f $@
diff --git a/Makerules b/Makerules
index ab36e2f..43fa5a7 100644
--- a/Makerules
+++ b/Makerules
@@ -1,4 +1,4 @@
-# Copyright (C) 1991-2006, 2007, 2008 Free Software Foundation, Inc.
+# Copyright (C) 1991-2006,2007,2008,2009 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# The GNU C Library is free software; you can redistribute it and/or
@@ -1335,6 +1335,7 @@ echo-headers:
%.bz2: %; bzip2 -9vk $<
%.gz: %; gzip -9vnc $< > $@.new && mv -f $@.new $@
+%.xz: %; xz -9evk $<
# Common cleaning targets.
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 13 ++++++++++++
Makefile | 63 ++++++++++++++++++++++++------------------------------------
Makerules | 3 +-
version.h | 2 +-
4 files changed, 41 insertions(+), 40 deletions(-)
hooks/post-receive
--
GNU C Library master sources