patches/glibc/2.6.1/120-fix-pr631.patch
author Anthony Foiani <anthony.foiani@gmail.com>
Thu May 19 23:09:43 2011 +0200 (2011-05-19)
branch1.11
changeset 2465 5f98b7a90fbc
parent 744 4bf8448536d5
permissions -rw-r--r--
complibs/ppl: fix 0.11-0.11.2 to compile with --disable-shared

PPL 0.11 (through 0.11.2) had a small bug where it still tried to build
and test its Java interface even when shared libraries are disabled.
Since that's exactly what ct-ng does, it explodes.

This is the patch from the PPL authors (see final link below).

More information can be found in these messages/threads:

Anthony's initial report and analysis with Yann:
http://www.cygwin.com/ml/crossgcc/2011-05/msg00046.html

Ron Flory hit the same problem:
http://www.cygwin.com/ml/crossgcc/2011-05/msg00054.html

Anthony's report to the ppl-devel list:
http://www.cs.unipr.it/pipermail/ppl-devel/2011-May/017450.html

Roberto's reply with a link to the fix in the PPL git repo:
http://www.cs.unipr.it/pipermail/ppl-devel/2011-May/017455.html

Signed-Off-By: Anthony Foiani <anthony.foiani@gmail.com>
(transplanted from 139b85d70b623e51f7585e7c64ecb8c6a6cf4567)
     1 From dank@kegel.com
     2 Wed Jun 15 09:12:43 PDT 2005
     3 
     4 Fixes
     5 
     6 build-glibc/libc.a(nsswitch.o)(.data+0x64): undefined reference to `_nss_files_getaliasent_r'
     7 build-glibc/libc.a(nsswitch.o)(.data+0x6c): undefined reference to `_nss_files_endaliasent'
     8 ... 53 lines deleted ...
     9 build-glibc/libc.a(nsswitch.o)(.data+0x21c): undefined reference to `_nss_files_getspnam_r'
    10 collect2: ld returned 1 exit status
    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
    12 
    13 when building glibc with --enable-static-nss.
    14 
    15 See http://sources.redhat.com/bugzilla/show_bug.cgi?id=631
    16 
    17 --- glibc-2.3.5/Makeconfig.old	Wed Jun 15 08:13:12 2005
    18 +++ glibc-2.3.5/Makeconfig	Wed Jun 15 08:13:14 2005
    19 @@ -510,7 +510,7 @@
    20  
    21  # The static libraries.
    22  ifeq (yes,$(build-static))
    23 -link-libc-static = $(common-objpfx)libc.a $(static-gnulib) $(common-objpfx)libc.a
    24 +link-libc-static = $(common-objpfx)libc.a $(static-gnulib) $(otherlibs) $(common-objpfx)libc.a
    25  else
    26  ifeq (yes,$(build-shared))
    27  # We can try to link the programs with lib*_pic.a...
    28 --- glibc-2.3.5/elf/Makefile.old	Wed Jun 15 07:46:49 2005
    29 +++ glibc-2.3.5/elf/Makefile	Wed Jun 15 08:14:00 2005
    30 @@ -120,6 +120,13 @@
    31  install-bin-script = ldd
    32  endif
    33  
    34 +ifeq (yes,$(build-static-nss))
    35 +nssobjdir := $(patsubst ../$(subdir),.,$(common-objpfx)nss)
    36 +resolvobjdir := $(patsubst ../$(subdir),.,$(common-objpfx)resolv)
    37 +otherlibs += $(nssobjdir)/libnss_files.a $(resolvobjdir)/libnss_dns.a \
    38 +	     $(resolvobjdir)/libresolv.a
    39 +endif
    40 +
    41  others		= sprof sln
    42  install-bin	= sprof
    43  others-static   = sln
    44 
    45 Signed-off-by: Robert P. J. Day <rpjday@mindspring.com>