diff options
author | Marc Kleine-Budde <mkl@pengutronix.de> | 2008-10-22 09:18:37 +0000 |
---|---|---|
committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2008-10-22 09:18:37 +0000 |
commit | 2d718dd121075d2b2cbe8db759b480fe549a9e32 (patch) | |
tree | 60e386e346c175412b57601841f59b420329357d | |
parent | b1cc2bc8143a6c0bbf7e158f6335c8dc6b1170ae (diff) | |
download | OSELAS.Toolchain-2d718dd121075d2b2cbe8db759b480fe549a9e32.tar.gz OSELAS.Toolchain-2d718dd121075d2b2cbe8db759b480fe549a9e32.tar.xz |
* generic/gentoo/1090_all_glibc-2.3.6-fix-pr631.patch:
new
git-svn-id: https://svn.pengutronix.de/svn/oselas/toolchain/trunks/OSELAS.Toolchain-trunk@7894 f8d472c7-5700-0410-ac5a-87979cec3adf
-rw-r--r-- | patches/glibc-2.3.6/generic/gentoo/1090_all_glibc-2.3.6-fix-pr631.patch | 52 | ||||
-rw-r--r-- | patches/glibc-2.3.6/generic/series | 1 |
2 files changed, 53 insertions, 0 deletions
diff --git a/patches/glibc-2.3.6/generic/gentoo/1090_all_glibc-2.3.6-fix-pr631.patch b/patches/glibc-2.3.6/generic/gentoo/1090_all_glibc-2.3.6-fix-pr631.patch new file mode 100644 index 0000000..2c26093 --- /dev/null +++ b/patches/glibc-2.3.6/generic/gentoo/1090_all_glibc-2.3.6-fix-pr631.patch @@ -0,0 +1,52 @@ +From dank@kegel.com +Wed Jun 15 09:12:43 PDT 2005 + +Fixes + +build-glibc/libc.a(nsswitch.o)(.data+0x64): undefined reference to `_nss_files_getaliasent_r' +build-glibc/libc.a(nsswitch.o)(.data+0x6c): undefined reference to `_nss_files_endaliasent' +... 53 lines deleted ... +build-glibc/libc.a(nsswitch.o)(.data+0x21c): undefined reference to `_nss_files_getspnam_r' +collect2: ld returned 1 exit status +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 + +when building glibc with --enable-static-nss. + +See http://sources.redhat.com/bugzilla/show_bug.cgi?id=631 + +--- + Makeconfig | 2 +- + elf/Makefile | 7 +++++++ + 2 files changed, 8 insertions(+), 1 deletion(-) + +Index: glibc-2.5/Makeconfig +=================================================================== +--- glibc-2.5.orig/Makeconfig ++++ glibc-2.5/Makeconfig +@@ -510,7 +510,7 @@ endif + + # The static libraries. + ifeq (yes,$(build-static)) +-link-libc-static = $(common-objpfx)libc.a $(static-gnulib) $(common-objpfx)libc.a ++link-libc-static = $(common-objpfx)libc.a $(static-gnulib) $(otherlibs) $(common-objpfx)libc.a + else + ifeq (yes,$(build-shared)) + # We can try to link the programs with lib*_pic.a... +Index: glibc-2.5/elf/Makefile +=================================================================== +--- glibc-2.5.orig/elf/Makefile ++++ glibc-2.5/elf/Makefile +@@ -120,6 +120,13 @@ install-others = $(inst_slibdir)/$(rtld- + install-bin-script = ldd + endif + ++ifeq (yes,$(build-static-nss)) ++nssobjdir := $(patsubst ../$(subdir),.,$(common-objpfx)nss) ++resolvobjdir := $(patsubst ../$(subdir),.,$(common-objpfx)resolv) ++otherlibs += $(nssobjdir)/libnss_files.a $(resolvobjdir)/libnss_dns.a \ ++ $(resolvobjdir)/libresolv.a ++endif ++ + others = sprof sln + install-bin = sprof + others-static = sln diff --git a/patches/glibc-2.3.6/generic/series b/patches/glibc-2.3.6/generic/series index 30d86f8..cddc32f 100644 --- a/patches/glibc-2.3.6/generic/series +++ b/patches/glibc-2.3.6/generic/series @@ -4,3 +4,4 @@ sysdeps_unix_sysv_linux_arm_ioperm_c-BUS_ISA.diff sysdeps_unix_sysv_linux_arm_socket_S-alias.diff sysdeps_arm-fp-byteorder.diff csu_Makefile-quotes.diff +gentoo/1090_all_glibc-2.3.6-fix-pr631.patch |