r3823 - in glibc-package/branches/multiarch/debian: . rules.d
Author: aurel32
Date: 2009-09-08 21:39:44 +0000 (Tue, 08 Sep 2009)
New Revision: 3823
Modified:
glibc-package/branches/multiarch/debian/rules
glibc-package/branches/multiarch/debian/rules.d/build.mk
Log:
Fix ld.so location in ELF header
Modified: glibc-package/branches/multiarch/debian/rules
===================================================================
--- glibc-package/branches/multiarch/debian/rules 2009-09-08 20:53:09 UTC (rev 3822)
+++ glibc-package/branches/multiarch/debian/rules 2009-09-08 21:39:44 UTC (rev 3823)
@@ -89,6 +89,7 @@
docdir=$(prefix)/share/doc
mandir=$(prefix)/share/man
sbindir=$(prefix)/sbin
+rtlddir = /lib
slibdir=/lib/$(DEB_HOST_GNU_TYPE)
libdir=/usr/lib/$(DEB_HOST_GNU_TYPE)
Modified: glibc-package/branches/multiarch/debian/rules.d/build.mk
===================================================================
--- glibc-package/branches/multiarch/debian/rules.d/build.mk 2009-09-08 20:53:09 UTC (rev 3822)
+++ glibc-package/branches/multiarch/debian/rules.d/build.mk 2009-09-08 21:39:44 UTC (rev 3823)
@@ -151,7 +151,7 @@
if [ $(curpass) = libc ]; then \
rtld_so="$$(LANG=C LC_ALL=C readelf -l debian/tmp-$(curpass)/usr/bin/iconv | grep 'interpreter' | sed -e 's/.*interpreter: \(.*\)]/\1/g')" ; \
link_name="debian/tmp-$(curpass)/lib/$$(basename $$rtld_so)" ; \
- target="$(call xx,slibdir)/$$(readlink $$rtld_so)" ; \
+ target="$(call xx,slibdir)/$$(readlink debian/tmp-$(curpass)/$$rtld_so)" ; \
ln -s $$target $$link_name ; \
fi
Reply to: