r5757 - in glibc-package/branches/eglibc-2.18/debian: . rules.d
Author: ps-guest
Date: 2013-11-09 11:32:29 +0000 (Sat, 09 Nov 2013)
New Revision: 5757
Modified:
glibc-package/branches/eglibc-2.18/debian/changelog
glibc-package/branches/eglibc-2.18/debian/rules.d/build.mk
Log:
rules.d/build.mk: do not explicitely install symlink in rtlddir
Modified: glibc-package/branches/eglibc-2.18/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/changelog 2013-11-09 11:30:00 UTC (rev 5756)
+++ glibc-package/branches/eglibc-2.18/debian/changelog 2013-11-09 11:32:29 UTC (rev 5757)
@@ -63,6 +63,7 @@
expected-results-i686-gnu-xen: Update testsuite result.
[ Petr Salinger ]
+ * rules.d/build.mk: do not explicitely install symlink in rtlddir
* kfreebsd/local-sysdeps.diff: update to revision 5135 (from glibc-bsd).
* kfreebsd/local-fbtl.diff: likewise
* sysdeps/kfreebsd.mk: pt_chown is mandatory
Modified: glibc-package/branches/eglibc-2.18/debian/rules.d/build.mk
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/rules.d/build.mk 2013-11-09 11:30:00 UTC (rev 5756)
+++ glibc-package/branches/eglibc-2.18/debian/rules.d/build.mk 2013-11-09 11:32:29 UTC (rev 5757)
@@ -256,7 +256,9 @@
fi
# Create the ld.so symlink to the multiarch directory
- if [ $(curpass) = libc ]; then \
+ #if [ $(curpass) = libc ]; then \
+ # it seems that the 2.18 Makefile already install symlink in rtlddir
+ if false ; then \
rtld_so="$$(LANG=C LC_ALL=C readelf -l debian/tmp-$(curpass)/usr/bin/iconv | grep 'interpreter' | sed -e 's/.*interpreter: \(.*\)]/\1/g')" ; \
rtld_so="$$(basename $$rtld_so)" ; \
link_name="debian/tmp-$(curpass)/lib/$$rtld_so" ; \
Reply to: