Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/glibc/ports-2.10.1/250-fix-pr631.patch
author Daniel Price <daniel.price@gmail.com>
Tue Nov 20 16:59:17 2012 -0800 (2012-11-20)
changeset 3126 333d3e40cbd1
permissions -rw-r--r--
scripts: refine static linking check to better guide the user

The current mechanism to check if static linking is possible, and the mesage
displayed on failure, can be puzzling to the unsuspecting user.

Also, the current implementation is not using the existing infrastructure,
and is thus difficult to enhance with new tests.

So, switch to using the standard CT_DoExecLog infra, and use four tests to
check for the host compiler:
- check we can run it
- check it can build a trivial program
- check it can statically link that program
- check if it statically link with libstdc++

That should cover most of the problems. Hopefully.

(At the same time, fix a typo in a comment)

Signed-off-by: Daniel Price <daniel.price@gmail.com>
[yann.morin.1998@free.fr: split original patch for self-contained changes]
[yann.morin.1998@free.fr: use steps to better see gcc's output]
[yann.morin.1998@free.fr: commit log]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Message-Id: <163f86b5216fc08c672a.1353459722@nipigon.dssd.com>
Patchwork-Id: 200536 
     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 diff -durN glibc-2.10.1.orig/Makeconfig glibc-2.10.1/Makeconfig

    18 --- glibc-2.10.1.orig/Makeconfig	2009-11-13 00:49:41.000000000 +0100

    19 +++ glibc-2.10.1/Makeconfig	2009-11-13 00:50:13.000000000 +0100

    20 @@ -509,7 +509,7 @@

    21  

    22  # The static libraries.

    23  ifeq (yes,$(build-static))

    24 -link-libc-static = $(common-objpfx)libc.a $(static-gnulib) $(common-objpfx)libc.a

    25 +link-libc-static = $(common-objpfx)libc.a $(static-gnulib) $(otherlibs) $(common-objpfx)libc.a

    26  else

    27  ifeq (yes,$(build-shared))

    28  # We can try to link the programs with lib*_pic.a...

    29 diff -durN glibc-2.10.1.orig/elf/Makefile glibc-2.10.1/elf/Makefile

    30 --- glibc-2.10.1.orig/elf/Makefile	2009-01-31 01:20:55.000000000 +0100

    31 +++ glibc-2.10.1/elf/Makefile	2009-11-13 00:50:13.000000000 +0100

    32 @@ -121,6 +121,13 @@

    33  install-bin-script = ldd

    34  endif

    35  

    36 +ifeq (yes,$(build-static-nss))

    37 +nssobjdir := $(patsubst ../$(subdir),.,$(common-objpfx)nss)

    38 +resolvobjdir := $(patsubst ../$(subdir),.,$(common-objpfx)resolv)

    39 +otherlibs += $(nssobjdir)/libnss_files.a $(resolvobjdir)/libnss_dns.a \

    40 +	     $(resolvobjdir)/libresolv.a

    41 +endif

    42 +

    43  others		= sprof sln

    44  install-bin	= sprof

    45  others-static   = sln
crosstool-ng