qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* Makeconfig ($(common-objpfx)config.status): 

Fix typo: $(add_ons) -> $(add-ons).
	(Makeconfig-add-on): New variable.  When doing $(sysdep-makeconfigs)
	include, use black magic to get it set to an add-on's name during the
	include of the add-on's Makeconfig.

	* configure.in: Use variable name `libc_add_on' when sourcing add-on
	configure fragments, so they can refer to this.
	* configure: Regenerated.
This commit is contained in:
Roland McGrath 2004-08-05 03:34:45 +00:00
parent 8cc5920e23
commit 9382fcee61
4 changed files with 728 additions and 315 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
2004-08-04 Roland McGrath <roland@frob.com>
* Makeconfig ($(common-objpfx)config.status):
Fix typo: $(add_ons) -> $(add-ons).
(Makeconfig-add-on): New variable. When doing $(sysdep-makeconfigs)
include, use black magic to get it set to an add-on's name during the
include of the add-on's Makeconfig.
* configure.in: Use variable name `libc_add_on' when sourcing add-on
configure fragments, so they can refer to this.
* configure: Regenerated.
2004-08-04 Roland McGrath <roland@redhat.com> 2004-08-04 Roland McGrath <roland@redhat.com>
* posix/tst-waitid.c (test_child): Sleep a second before stopping. * posix/tst-waitid.c (test_child): Sleep a second before stopping.

17
Makeconfig
View File

@ -120,7 +120,7 @@ $(common-objpfx)config.status: $(..)version.h $(..)configure \
$(firstword $(wildcard \ $(firstword $(wildcard \
$(addprefix $(dir)/,configure configure.in))))) \ $(addprefix $(dir)/,configure configure.in))))) \
$(patsubst %.in,%,\ $(patsubst %.in,%,\
$(foreach dir,$(add_ons),\ $(foreach dir,$(add-ons),\
$(firstword $(wildcard \ $(firstword $(wildcard \
$(addprefix $(..)$(dir)/,configure configure.in))))) $(addprefix $(..)$(dir)/,configure configure.in)))))
@cd $(@D); if test -f $(@F); then exec $(SHELL) $(@F) --recheck; else \ @cd $(@D); if test -f $(@F); then exec $(SHELL) $(@F) --recheck; else \
@ -980,12 +980,25 @@ sysdep-makeconfigs := $(wildcard $(patsubst %,$(..)%/Makeconfig,\
$(config-sysdirs) $(add-ons))) $(config-sysdirs) $(add-ons)))
ifneq (,$(sysdep-makeconfigs)) ifneq (,$(sysdep-makeconfigs))
include $(sysdep-makeconfigs) Makeconfig-doing-sysdep := $(sysdep-makeconfigs)
# Before each one, include ourselves again to do the bit below that
# will set `Makeconfig-add-on' in an add-on's Makeconfig fragment.
include $(foreach M,$(sysdep-makeconfigs),$(..)Makeconfig $M)
endif endif
endif # Makeconfig not yet included endif # Makeconfig not yet included
# The whole body above didn't run when we are included as a subroutine
# of ourselves in the sysdep-makeconfigs include line. This bit runs.
ifneq (,$(Makeconfig-doing-sysdep))
sysdep-Makeconfig := $(firstword $(Makeconfig-doing-sysdep))
Makeconfig-doing-sysdep := $(filter-out $(sysdep-Makeconfig),\
$(Makeconfig-doing-sysdep))
Makeconfig-add-on := $(filter $(add-ons),$(patsubst $(..)%/Makeconfig,%,\
$(sysdep-Makeconfig)))
endif
# Local Variables: # Local Variables:
# mode: makefile # mode: makefile
# End: # End:

1000
configure vendored
View File

File diff suppressed because it is too large Load Diff

14
configure.in
View File

@ -362,13 +362,15 @@ if test x"$add_ons" != x; then
fi fi
done done
for f in $add_ons; do # Now source each add-on's configure fragment.
frag=$srcdir/$f/configure # The fragments can use $srcdir/$libc_add_on to find themselves.
if test -r $frag; then for libc_add_on in $add_ons; do
AC_MSG_RESULT(running configure fragment for add-on $f) libc_add_on_frag=$srcdir/$libc_add_on/configure
. $frag if test -r $libc_add_on_frag; then
AC_MSG_RESULT(running configure fragment for add-on $libc_add_on)
. $libc_add_on_frag
else else
AC_MSG_WARN(add-on fragment $frag missing) AC_MSG_WARN(add-on fragment $libc_add_on_frag missing)
fi fi
done done
fi fi