aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--Makeconfig8
-rw-r--r--sysdeps/mach/hurd/configure4
-rw-r--r--sysdeps/mach/hurd/configure.ac4
-rw-r--r--sysdeps/unix/sysv/linux/configure4
-rw-r--r--sysdeps/unix/sysv/linux/configure.ac4
6 files changed, 12 insertions, 20 deletions
diff --git a/ChangeLog b/ChangeLog
index e9e707ab9f..fd7faedbab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2014-05-08 Roland McGrath <roland@hack.frob.com>
+ * Makeconfig ($(common-objpfx)config.status): Fix patsubst uses to
+ look for %.ac rather than %.in.
+
+ * sysdeps/mach/hurd/configure.ac (inhibit_glue): Remove variable.
+ * sysdeps/unix/sysv/linux/configure.ac: Likewise.
+ * sysdeps/mach/hurd/configure: Regenerated.
+ * sysdeps/unix/sysv/linux/configure: Regenerated.
+
* bits/utsname.h (_UTSNAME_DOMAIN_LENGTH): New macro, set to 0.
2014-05-07 Steve Ellcey <sellcey@mips.com>
diff --git a/Makeconfig b/Makeconfig
index f9653983b6..2df4c88e1a 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -86,12 +86,12 @@ $(common-objpfx)config.make: $(common-objpfx)config.status \
$(common-objpfx)config.status: $(..)version.h $(..)configure \
$(foreach dir,$(sysdirs),\
$(wildcard $(dir)/Implies) \
- $(patsubst %.in,%,\
+ $(patsubst %.ac,%,\
$(firstword $(wildcard \
$(addprefix $(dir)/,configure configure.ac))))) \
- $(patsubst %.in,%,\
+ $(patsubst %.ac,%,\
$(wildcard $(..)sysdeps/*/preconfigure $(..)sysdeps/*/preconfigure.ac)) \
- $(patsubst %.in,%,\
+ $(patsubst %.ac,%,\
$(foreach add-on,$(add-ons),\
$(firstword $(wildcard \
$(addprefix $(firstword $(filter /%,$(add-on)) $(..)$(add-on))/,\
@@ -1049,7 +1049,7 @@ ifndef avoid-generated
# existing directory not in all-subdirs, then sysd-sorted needs to
# be regenerated, so it depends on existing $(sorted-subdirs:=/Depend) files.
all-Depend-files := $(wildcard $(sort \
- $(foreach dir,$(all-subdirs),\
+ $(foreach dir,$(all-subdirs),\
$(firstword $($(dir)-srcdir) \
$(..)$(dir))/Depend) \
$(sorted-subdirs:=/Depend)))
diff --git a/sysdeps/mach/hurd/configure b/sysdeps/mach/hurd/configure
index a0f97217e9..21999f708b 100644
--- a/sysdeps/mach/hurd/configure
+++ b/sysdeps/mach/hurd/configure
@@ -3,10 +3,6 @@
$as_echo "#define NO_HIDDEN 1" >>confdefs.h
-# Don't bother trying to generate any glue code to be compatible with the
-# existing system library, because we are the only system library.
-inhibit_glue=yes
-
case "$machine" in
i386*)
# The default oldest ABI is 2.2.6.
diff --git a/sysdeps/mach/hurd/configure.ac b/sysdeps/mach/hurd/configure.ac
index ad915a568b..40b0743a17 100644
--- a/sysdeps/mach/hurd/configure.ac
+++ b/sysdeps/mach/hurd/configure.ac
@@ -3,10 +3,6 @@ GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
dnl We need this setting because of the need for PLT calls in ld.so.
AC_DEFINE([NO_HIDDEN])
-# Don't bother trying to generate any glue code to be compatible with the
-# existing system library, because we are the only system library.
-inhibit_glue=yes
-
case "$machine" in
i386*)
# The default oldest ABI is 2.2.6.
diff --git a/sysdeps/unix/sysv/linux/configure b/sysdeps/unix/sysv/linux/configure
index fb2e343a72..6ba2454d7e 100644
--- a/sysdeps/unix/sysv/linux/configure
+++ b/sysdeps/unix/sysv/linux/configure
@@ -32,10 +32,6 @@ $as_echo "$ac_res" >&6; }
# This file is generated from configure.ac by Autoconf. DO NOT EDIT!
# Local configure fragment for sysdeps/unix/sysv/linux.
-# Don't bother trying to generate any glue code to be compatible with the
-# existing system library, because we are the only system library.
-inhibit_glue=yes
-
if test -n "$sysheaders"; then
OLD_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $SYSINCLUDES"
diff --git a/sysdeps/unix/sysv/linux/configure.ac b/sysdeps/unix/sysv/linux/configure.ac
index 21c355bc11..d182978544 100644
--- a/sysdeps/unix/sysv/linux/configure.ac
+++ b/sysdeps/unix/sysv/linux/configure.ac
@@ -1,10 +1,6 @@
GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
# Local configure fragment for sysdeps/unix/sysv/linux.
-# Don't bother trying to generate any glue code to be compatible with the
-# existing system library, because we are the only system library.
-inhibit_glue=yes
-
define([LIBC_LINUX_VERSION],[2.6.32])dnl
if test -n "$sysheaders"; then
OLD_CPPFLAGS=$CPPFLAGS