OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* configure.in (add_ons): Substitute this. Move $add_ons handling 

after AC_CANONICAL_HOST and default setting of $machine et al.
	Don't set $subdirs from $add_ons.
	Instead, source add-on/configure fragments early on.
	(base_machine): If it's already set, don't set it based on $machine.
	(libc_config_ok): New variable, set to no.  If an add-on fragment sets
	it to yes, skip the  tuple sanity check as if --enable-hacker-mode.
	(sysnames): Try appending add-on names after machine as well.
	* configure: Regenerated.
	* config.make.in (add-ons): Set from @add_ons@ instead of @subdirs@.
	* Makeconfig ($(common-objpfx)config.status): Also depend on configure
	files in $(add_ons) dirs.

	* sysdeps/unix/sysv/linux/bits/in.h (struct ip_mreq): Remove
	definition, now in netinet/in.h proper.

	long.  Rewrite example code so that it takes into account l64a output
This commit is contained in:
Roland McGrath 2004-07-20 22:14:59 +00:00
parent 3a261340b8
commit 8f73811bcf
9 changed files with 500 additions and 799 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ChangeLog
View File

@ -1,3 +1,21 @@
2004-07-20 Roland McGrath <roland@redhat.com>
* configure.in (add_ons): Substitute this. Move $add_ons handling
after AC_CANONICAL_HOST and default setting of $machine et al.
Don't set $subdirs from $add_ons.
Instead, source add-on/configure fragments early on.
(base_machine): If it's already set, don't set it based on $machine.
(libc_config_ok): New variable, set to no. If an add-on fragment sets
it to yes, skip the tuple sanity check as if --enable-hacker-mode.
(sysnames): Try appending add-on names after machine as well.
* configure: Regenerated.
* config.make.in (add-ons): Set from @add_ons@ instead of @subdirs@.
* Makeconfig ($(common-objpfx)config.status): Also depend on configure
files in $(add_ons) dirs.
* sysdeps/unix/sysv/linux/bits/in.h (struct ip_mreq): Remove
definition, now in netinet/in.h proper.
2004-07-20 Alexandre Oliva <aoliva@redhat.com>
* sysdeps/unix/sysv/linux/mips/Makefile ($(objpfx)syscall-%.h):
@ -136,7 +154,7 @@
[BZ #266]
* manual/string.texi (l64a): Note that the static buffer is 7 bytes
long. Rewrite example code so that it takes account l64a output
long. Rewrite example code so that it takes into account l64a output
shorter than 6 characters.
Reported by Julian Graham <julian.graham@aya.yale.edu>.

10
Makeconfig
View File

@ -110,15 +110,19 @@ $(common-objpfx)config.make: $(common-objpfx)config.status \
$(..)config.make.in $(..)config.h.in
cd $(<D); $(SHELL) $(<F)
# Find all the sysdeps configure fragments, to make sure we re-run
# configure when any of them changes.
# Find all the add-on and sysdeps configure fragments, to make sure we
# re-run configure when any of them changes.
$(common-objpfx)config.status: $(..)version.h $(..)configure \
$(foreach dir,$(full_config_sysdirs),\
$(wildcard \
$(dir)/Implies) \
$(patsubst %.in,%,\
$(firstword $(wildcard \
$(addprefix $(dir)/,configure configure.in)))))
$(addprefix $(dir)/,configure configure.in))))) \
$(patsubst %.in,%,\
$(foreach dir,$(add_ons),\
$(firstword $(wildcard \
$(addprefix $(..)$(dir)/,configure configure.in)))))
@cd $(@D); if test -f $(@F); then exec $(SHELL) $(@F) --recheck; else \
echo The GNU C library has not been configured. >&2; \
echo Run \`configure\' to configure it before building. >&2; \

2
config.make.in
View File

@ -87,7 +87,7 @@ build-profile = @profile@
build-omitfp = @omitfp@
build-bounded = @bounded@
build-static-nss = @static_nss@
add-ons = @subdirs@
add-ons = @add_ons@
cross-compiling = @cross_compiling@
force-install = @force_install@

1131
configure vendored
View File

File diff suppressed because it is too large Load Diff

115
configure.in
View File

@ -210,38 +210,6 @@ AC_ARG_ENABLE([bind-now],
[bindnow=no])
AC_SUBST(bindnow)
AC_CONFIG_SUBDIRS([ ])dnl Bonehead new Autoconf whines if we do it cleanly.
add_ons_pfx=
if test x"$add_ons" != x; then
for f in $add_ons; do
# Some sanity checks
if test "$f" = "crypt"; then
AC_MSG_ERROR([
*** It seems that you're using an old \`crypt' add-on. crypt is now
*** part of glibc and using the old add-on will not work with this
*** release. Start again with fresh sources and without the old
*** \`crypt' add-on.])
fi
if test "$f" = "localedata"; then
AC_MSG_ERROR([
*** It seems that you're using an old \`localedata' add-on. localedata
*** is now part of glibc and using the old add-on will not work with
*** this release. Start again with fresh sources and without the old
*** \`localedata' add-on.])
fi
# Test whether such a subdir really exists.
if test -d $srcdir/$f; then
add_ons_pfx="$add_ons_pfx $f/"
dnl This variable is what AC_CONFIG_SUBDIRS is supposed to set,
dnl but the new Autoconf maintainers don't care about compatibility
dnl so we cannot use it normally any more without complaints.
subdirs="$subdirs $f"
else
AC_MSG_ERROR(add-on directory \"$f\" does not exist)
fi
done
fi
dnl On some platforms we cannot use dynamic loading. We must provide
dnl static NSS modules.
AC_ARG_ENABLE([static-nss],
@ -334,6 +302,9 @@ aix*)
;;
esac
# The configure fragment of an add-on port can modify these to supplement
# or override the table in the case statement below. No fragment should
# ever change the config_* variables, however.
machine=$config_machine
vendor=$config_vendor
os=$config_os
@ -351,6 +322,59 @@ case "$machine-$host_os" in
;;
esac
# An add-on can set this when it the tuple to disable the sanity check below.
libc_config_ok=no
dnl Having this here, though empty, makes sure that if add-ons' fragments
dnl do AC_CONFIG_SUBDIRS([some-dir]), which just sets $subdirs, then
dnl our AC_OUTPUT will actually use it.
AC_CONFIG_SUBDIRS()
add_ons_sfx=
add_ons_pfx=
if test x"$add_ons" != x; then
for f in $add_ons; do
# Some sanity checks
case "$f" in
crypt)
AC_MSG_ERROR([
*** It seems that you're using an old \`crypt' add-on. crypt is now
*** part of glibc and using the old add-on will not work with this
*** release. Start again with fresh sources and without the old
*** \`crypt' add-on.])
;;
localedata)
AC_MSG_ERROR([
*** It seems that you're using an old \`localedata' add-on. localedata
*** is now part of glibc and using the old add-on will not work with
*** this release. Start again with fresh sources and without the old
*** \`localedata' add-on.])
;;
esac
# Test whether such a subdir really exists.
if test -d $srcdir/$f; then
add_ons_pfx="$add_ons_pfx $f/"
add_ons_sfx="$add_ons_sfx /$f"
else
AC_MSG_ERROR(add-on directory \"$f\" does not exist)
fi
done
for f in $add_ons; do
frag=$srcdir/$f/configure
if test -r $frag; then
AC_MSG_RESULT(running configure fragment for add-on $f)
. $frag
else
AC_MSG_WARN(add-on fragment $frag missing)
fi
done
fi
AC_SUBST(add_ons)
###
### I put this here to prevent those annoying emails from people who cannot
### read and try to compile glibc on unsupported platforms. --drepper
@ -359,7 +383,7 @@ esac
### one can skip this test to make the configuration not fail for unsupported
### platforms.
###
if test -z "$enable_hacker_mode"; then
if test -z "$enable_hacker_mode" && test x"$libc_config_ok" != xyes; then
case "$machine-$host_os" in
*-linux* | *-gnu* | arm*-none* | powerpc-aix4.3.*)
;;
@ -378,8 +402,9 @@ fi
dnl We need to use [ and ] for other purposes for a while now.
changequote(,)dnl
# Expand the configuration machine name into a subdirectory by architecture
# type and particular chip.
case "$machine" in
# type and particular chip. If an add-on configure fragment already set
# base_machine, we don't change it.
test -n "$base_machine" || case "$machine" in
a29k | am29000) base_machine=a29k machine=a29k ;;
alpha*) base_machine=alpha machine=alpha/$machine ;;
arm*) base_machine=arm machine=arm/arm32/$machine ;;
@ -535,16 +560,18 @@ for d in $add_ons_pfx ''; do
for o in /$ostry ''; do
test "$o" = / && continue
for m in $mach ''; do
if test "$m0$b$v$o$m"; then
try="${d}sysdeps$m0$b$v$o$m"
test -n "$enable_debug_configure" &&
echo "$0 [DEBUG]: try $try" >&2
if test -d $srcdir/$try; then
sysnames="$sysnames $try"
{ test -n "$o" || test -n "$b"; } && os_used=t
{ test -n "$m" || test -n "$m0"; } && machine_used=t
for a in $add_ons_sfx ''; do
if test "$m0$b$v$o$m"; then
try="${d}sysdeps$m0$b$v$o$m$a"
test -n "$enable_debug_configure" &&
echo "$0 [DEBUG]: try $try" >&2
if test -d $srcdir/$try; then
sysnames="$sysnames $try"
{ test -n "$o" || test -n "$b"; } && os_used=t
{ test -n "$m" || test -n "$m0"; } && machine_used=t
fi
fi
fi
done
done
done
done

4
libidn/ChangeLog
View File

@ -1,3 +1,7 @@
2004-07-02 Roland McGrath <roland@redhat.com>
* configure: Don't exit.
2004-05-21 Ulrich Drepper <drepper@redhat.com>
* idna.c (idna_to_unicode_4z4z): Fix test for failed memory allocation.

4
linuxthreads/ChangeLog
View File

@ -1,3 +1,7 @@
2004-07-02 Roland McGrath <roland@redhat.com>
* configure: Don't exit.
2004-07-20 Alexandre Oliva <aoliva@redhat.com>
* sysdeps/mips/pt-machine.h: Use standard names for ABI macros,

4
nptl/ChangeLog
View File

@ -1,3 +1,7 @@
2004-07-02 Roland McGrath <roland@redhat.com>
* configure: Don't exit.
2004-07-14 Kaz Kojima <kkojima@rr.iij4u.or.jp>
* sysdeps/unix/sysv/linux/sh/pthread_cond_timedwait.S

9
sysdeps/unix/sysv/linux/bits/in.h
View File

@ -85,14 +85,7 @@ struct ip_opts
char ip_opts[40]; /* Actually variable in size. */
};
/* Structure used for IP_ADD_MEMBERSHIP and IP_DROP_MEMBERSHIP. */
struct ip_mreq
{
struct in_addr imr_multiaddr; /* IP multicast address of group */
struct in_addr imr_interface; /* local IP address of interface */
};
/* As above but including interface specification by index. */
/* Like `struct ip_mreq' but including interface specification by index. */
struct ip_mreqn
{
struct in_addr imr_multiaddr; /* IP multicast address of group */