r6409 - glibc-package/branches/glibc-2.21/debian/patches/any
Author: sthibault
Date: 2015-03-21 00:06:00 +0000 (Sat, 21 Mar 2015)
New Revision: 6409
Modified:
glibc-package/branches/glibc-2.21/debian/patches/any/local-rtlddir-cross.diff
Log:
refresh
Modified: glibc-package/branches/glibc-2.21/debian/patches/any/local-rtlddir-cross.diff
===================================================================
--- glibc-package/branches/glibc-2.21/debian/patches/any/local-rtlddir-cross.diff 2015-03-21 00:05:36 UTC (rev 6408)
+++ glibc-package/branches/glibc-2.21/debian/patches/any/local-rtlddir-cross.diff 2015-03-21 00:06:00 UTC (rev 6409)
@@ -5,10 +5,10 @@
path in libc.so ends up blowing up cross-compilers for no reason.
Author: Adam Conrad <adconrad@ubuntu.com>
-diff --git a/Makeconfig b/Makeconfig
-index 6618987..b9f8680 100644
---- a/Makeconfig
-+++ b/Makeconfig
+Index: glibc-2.21/Makeconfig
+===================================================================
+--- glibc-2.21.orig/Makeconfig
++++ glibc-2.21/Makeconfig
@@ -161,7 +161,7 @@ inst_slibdir = $(install_root)$(slibdir)
ifndef rtlddir
rtlddir = $(slibdir)
@@ -18,16 +18,16 @@
# Prefix to put on files installed in $(libdir). For libraries `libNAME.a',
# the prefix is spliced between `lib' and the name, so the linker switch
-diff --git a/Makerules b/Makerules
-index 92c2872..cb45f90 100644
---- a/Makerules
-+++ b/Makerules
-@@ -960,7 +960,7 @@ $(inst_libdir)/libc.so: $(common-objpfx)format.lds \
+Index: glibc-2.21/Makerules
+===================================================================
+--- glibc-2.21.orig/Makerules
++++ glibc-2.21/Makerules
+@@ -1068,7 +1068,7 @@ $(inst_libdir)/libc.so: $(common-objpfx)
cat $<; \
echo 'GROUP ( $(slibdir)/libc.so$(libc.so-version)' \
'$(libdir)/$(patsubst %,$(libtype.oS),$(libprefix)$(libc-name))'\
- ' AS_NEEDED (' $(rtlddir)/$(rtld-installed-name) ') )' \
+ ' AS_NEEDED (' $(slibdir)/$(rtld-installed-name) ') )' \
) > $@.new
- mv -f $@.new $@
-
+ ifeq ($(patsubst gnu%,,$(config-os)),)
+ echo 'INPUT ( AS_NEEDED ( -lmachuser -lhurduser ) )' >> $@.new
Reply to: