patches/glibc/ports-2.12.1/250-fix-pr631.patch
author "Benoît THÉBAUDEAU" <benoit.thebaudeau@advansee.com>
Thu Jul 28 22:09:31 2011 +0200 (2011-07-28)
changeset 2573 424fa2092ace
permissions -rw-r--r--
scripts/libc: do not build add-ons by default

Currently, no --enable-add-ons option is passed to libc configure when
"$(do_libc_add_ons_list ,)" is empty, which makes configure automatically search
for present add-ons. In that case, all present add-ons are built, although
no add-on was selected by the user in the config. Moreover, this can make the
configure fail if some non-standard add-ons like eglibc-localedef are present.

This behavior also leads to an inconsistency from a user point of view between
the following cases:
- LIBC_ADDONS_LIST="", LIBC_GLIBC_USE_PORTS=n and THREADS="none" in the config,
which makes "$(do_libc_add_ons_list ,)" return "", so all present add-ons
are built.
- LIBC_ADDONS_LIST="", LIBC_GLIBC_USE_PORTS=n and THREADS!="none" in the
config, which makes "$(do_libc_add_ons_list ,)" return the add-on supporting
the chosen threading implementation, e.g. "nptl", so only this add-on is
built.

This patch disables the building of all add-ons in that case.

It is still possible to build all present add-ons by adding --enable-add-ons to
LIBC_GLIBC_EXTRA_CONFIG_ARRAY.

Signed-off-by: "Benoît THÉBAUDEAU" <benoit.thebaudeau@advansee.com>
yann@2437
     1
From dank@kegel.com
yann@2437
     2
Wed Jun 15 09:12:43 PDT 2005
yann@2437
     3
yann@2437
     4
Fixes
yann@2437
     5
yann@2437
     6
build-glibc/libc.a(nsswitch.o)(.data+0x64): undefined reference to `_nss_files_getaliasent_r'
yann@2437
     7
build-glibc/libc.a(nsswitch.o)(.data+0x6c): undefined reference to `_nss_files_endaliasent'
yann@2437
     8
... 53 lines deleted ...
yann@2437
     9
build-glibc/libc.a(nsswitch.o)(.data+0x21c): undefined reference to `_nss_files_getspnam_r'
yann@2437
    10
collect2: ld returned 1 exit status
yann@2437
    11
make[2]: *** [/build/gcc-3.4.3-glibc-2.3.5-hdrs-2.6.11.2/i686-unknown-linux-gnu/build-glibc/elf/ldconfig] Error 1
yann@2437
    12
yann@2437
    13
when building glibc with --enable-static-nss.
yann@2437
    14
yann@2437
    15
See http://sources.redhat.com/bugzilla/show_bug.cgi?id=631
yann@2437
    16
yann@2437
    17
diff -durN glibc-2.12.1.orig/Makeconfig glibc-2.12.1/Makeconfig
yann@2437
    18
--- glibc-2.12.1.orig/Makeconfig	2009-11-13 00:49:41.000000000 +0100
yann@2437
    19
+++ glibc-2.12.1/Makeconfig	2009-11-13 00:50:13.000000000 +0100
yann@2437
    20
@@ -531,7 +531,7 @@
yann@2437
    21
 
yann@2437
    22
 # The static libraries.
yann@2437
    23
 ifeq (yes,$(build-static))
yann@2437
    24
-link-libc-static = $(common-objpfx)libc.a $(static-gnulib) $(common-objpfx)libc.a
yann@2437
    25
+link-libc-static = $(common-objpfx)libc.a $(static-gnulib) $(otherlibs) $(common-objpfx)libc.a
yann@2437
    26
 else
yann@2437
    27
 ifeq (yes,$(build-shared))
yann@2437
    28
 # We can try to link the programs with lib*_pic.a...
yann@2437
    29
diff -durN glibc-2.12.1.orig/elf/Makefile glibc-2.12.1/elf/Makefile
yann@2437
    30
--- glibc-2.12.1.orig/elf/Makefile	2009-01-31 01:20:55.000000000 +0100
yann@2437
    31
+++ glibc-2.12.1/elf/Makefile	2009-11-13 00:50:13.000000000 +0100
yann@2437
    32
@@ -146,6 +146,13 @@
yann@2437
    33
 install-bin-script = ldd
yann@2437
    34
 endif
yann@2437
    35
 
yann@2437
    36
+ifeq (yes,$(build-static-nss))
yann@2437
    37
+nssobjdir := $(patsubst ../$(subdir),.,$(common-objpfx)nss)
yann@2437
    38
+resolvobjdir := $(patsubst ../$(subdir),.,$(common-objpfx)resolv)
yann@2437
    39
+otherlibs += $(nssobjdir)/libnss_files.a $(resolvobjdir)/libnss_dns.a \
yann@2437
    40
+	     $(resolvobjdir)/libresolv.a
yann@2437
    41
+endif
yann@2437
    42
+
yann@2437
    43
 others		= sprof sln
yann@2437
    44
 install-bin	= sprof
yann@2437
    45
 others-static   = sln