AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-21 20:40:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

* version.h (VERSION): 2.3.91

Browse Source 
* Makeconfig (sysdeps-srcdirs): New variable.
	(sysdeps-add-ons-srcdirs): Use it.
	* csu/Makefile (all-Banner-files): Use it.

	* Makefile (dist-selector): New variable.
	(glibc-%.tar rule): Use it.  Make $(dist-separate) tarballs
	contain one version-named directory.
This commit is contained in:
Roland McGrath 2006-03-01 10:35:59 +00:00
parent c9dc3f6269
commit 04dca8d316
5 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,6 +1,17 @@
2006-03-01 Roland McGrath <roland@redhat.com> 2006-03-01 Roland McGrath <roland@redhat.com>
* version.h (VERSION): 2.3.91
* Makeconfig (sysdeps-srcdirs): New variable.
(sysdeps-add-ons-srcdirs): Use it.
* csu/Makefile (all-Banner-files): Use it.
* Makefile (dist-selector): New variable.
(glibc-%.tar rule): Use it. Make $(dist-separate) tarballs
contain one version-named directory.
* Makefile (format-me): Use --plaintext --no-number-sections. * Makefile (format-me): Use --plaintext --no-number-sections.
* NOTES, INSTALL: Regenerated. * NOTES, INSTALL: Regenerated.
* NEWS: Update 2.4 items. * NEWS: Update 2.4 items.

7
Makeconfig
View File

@ -107,9 +107,10 @@ sysdirs := $(foreach D,$(config-sysdirs),$(firstword $(filter /%,$D) $(..)$D))
# to find specific add-on files without assuming the add-on directory name. # to find specific add-on files without assuming the add-on directory name.
# It also means that headers can go into an add-on's base directory # It also means that headers can go into an add-on's base directory
# instead of the add-on needing a sysdeps/generic of its own. # instead of the add-on needing a sysdeps/generic of its own.
+sysdep_dirs := $(sysdirs) $(foreach add-on,$(sysdeps-add-ons),\ sysdeps-srcdirs := $(foreach add-on,$(sysdeps-add-ons),\
$(firstword $(filter /%,$(add-on)) \ $(firstword $(filter /%,$(add-on)) \
$(..)$(add-on))) $(..)$(add-on)))
+sysdep_dirs = $(sysdirs) $(sysdeps-srcdirs)
ifdef objdir ifdef objdir
+sysdep_dirs := $(objdir) $(+sysdep_dirs) +sysdep_dirs := $(objdir) $(+sysdep_dirs)
endif endif

12
Makefile
View File

@ -358,20 +358,18 @@ endif
files-for-dist := README FAQ INSTALL NOTES configure files-for-dist := README FAQ INSTALL NOTES configure
tag-of-stem = glibc-$(subst .,_,$*) tag-of-stem = glibc-$(subst .,_,$*)
dist-selector = -r $(tag-of-stem)
# Add-ons in the main repository but distributed in their own tar files. # Add-ons in the main repository but distributed in their own tar files.
dist-separate = libidn dist-separate = libidn
# Directories in each add-on.
dist-separate-libidn = libidn
glibc-%.tar $(dist-separate:%=glibc-%-%.tar): $(files-for-dist) \ glibc-%.tar $(dist-separate:%=glibc-%-%.tar): $(files-for-dist) \
$(foreach D,$(dist-separate),\ $(foreach D,$(dist-separate),\
$D/configure) $D/configure)
@rm -fr glibc-$* @rm -fr glibc-$*
$(MAKE) -q `find sysdeps $(addsuffix /sysdeps,$(sysdeps-add-ons)) \ $(MAKE) -q `find sysdeps $(addsuffix /sysdeps,$(sysdeps-add-ons)) \
-name configure` -name configure`
cvs $(CVSOPTS) -Q export -d glibc-$* -r $(tag-of-stem) libc cvs $(CVSOPTS) -Q export -d glibc-$* $(dist-selector) libc
# Touch all the configure scripts going into the tarball since cvs export # Touch all the configure scripts going into the tarball since cvs export
# might have delivered configure.in newer than configure. # might have delivered configure.in newer than configure.
find glibc-$* -name configure -print | xargs touch find glibc-$* -name configure -print | xargs touch
@ -380,8 +378,10 @@ glibc-%.tar $(dist-separate:%=glibc-%-%.tar): $(files-for-dist) \
rm -fr glibc-$* rm -fr glibc-$*
define dist-do-separate-dirs define dist-do-separate-dirs
$(foreach dir,$(dist-separate), $(foreach dir,$(dist-separate),
tar cf glibc-$(dir)-$*.tar -C glibc-$* $(dist-separate-$(dir)) @rm -fr glibc-$(dir)-$*
rm -rf $(addprefix glibc-$*/,$(dist-separate-$(dir))) mv glibc-$*/$(dir) glibc-$(dir)-$*
tar cf glibc-$(dir)-$*.tar glibc-$(dir)-$*
rm -fr glibc-$(dir)-$*
) )
endef endef

4
csu/Makefile
View File

@ -200,7 +200,9 @@ $(objpfx)abi-tag.h: $(..)abi-tags
if test -r $@.new; then mv -f $@.new $@; \ if test -r $@.new; then mv -f $@.new $@; \
else echo >&2 'This configuration not matched in $<'; exit 1; fi else echo >&2 'This configuration not matched in $<'; exit 1; fi
all-Banner-files = $(wildcard $(addsuffix /Banner,$(subdir-srcdirs))) all-Banner-files = $(wildcard $(addsuffix /Banner,\
$(sort $(subdir-srcdirs) \
$(sysdeps-srcdirs))))
$(objpfx)version-info.h: $(common-objpfx)config.make $(all-Banner-files) $(objpfx)version-info.h: $(common-objpfx)config.make $(all-Banner-files)
$(make-target-directory) $(make-target-directory)
(case $(config-os) in \ (case $(config-os) in \

2
version.h
View File

@ -1,4 +1,4 @@
/* This file just defines the current version number of libc. */ /* This file just defines the current version number of libc. */
#define RELEASE "development" #define RELEASE "development"
#define VERSION "2.3.90" #define VERSION "2.3.91"