r3780 - in glibc-package/branches/multiarch/debian: . rules.d sysdeps
Author: aurel32
Date: 2009-08-23 21:29:53 +0000 (Sun, 23 Aug 2009)
New Revision: 3780
Modified:
glibc-package/branches/multiarch/debian/rules
glibc-package/branches/multiarch/debian/rules.d/build.mk
glibc-package/branches/multiarch/debian/rules.d/debhelper.mk
glibc-package/branches/multiarch/debian/sysdeps/amd64.mk
Log:
Install the libc in the multiarch path
Modified: glibc-package/branches/multiarch/debian/rules
===================================================================
--- glibc-package/branches/multiarch/debian/rules 2009-08-23 16:27:53 UTC (rev 3779)
+++ glibc-package/branches/multiarch/debian/rules 2009-08-23 21:29:53 UTC (rev 3780)
@@ -89,6 +89,8 @@
docdir=$(prefix)/share/doc
mandir=$(prefix)/share/man
sbindir=$(prefix)/sbin
+slibdir=/lib/$(DEB_HOST_GNU_TYPE)
+libdir=/usr/lib/$(DEB_HOST_GNU_TYPE)
BUILD_CC = gcc
BUILD_CXX = g++
Modified: glibc-package/branches/multiarch/debian/rules.d/build.mk
===================================================================
--- glibc-package/branches/multiarch/debian/rules.d/build.mk 2009-08-23 16:27:53 UTC (rev 3779)
+++ glibc-package/branches/multiarch/debian/rules.d/build.mk 2009-08-23 21:29:53 UTC (rev 3780)
@@ -148,7 +148,6 @@
machine=`sed '/^ *config-machine *=/!d;s/.*= *//g' $(DEB_BUILDDIR)/config.make`; \
os=`sed '/^ *config-os *=/!d;s/.*= *//g' $(DEB_BUILDDIR)/config.make`; \
triplet="$$machine-$$os"; \
- mkdir -p debian/tmp-$(curpass)/lib/$$triplet debian/tmp-$(curpass)/usr/lib/$$triplet; \
conffile="debian/tmp-$(curpass)/etc/ld.so.conf.d/$$triplet.conf"; \
echo "# Multiarch support" > $$conffile; \
echo /lib/$$triplet >> $$conffile; \
Modified: glibc-package/branches/multiarch/debian/rules.d/debhelper.mk
===================================================================
--- glibc-package/branches/multiarch/debian/rules.d/debhelper.mk 2009-08-23 16:27:53 UTC (rev 3779)
+++ glibc-package/branches/multiarch/debian/rules.d/debhelper.mk 2009-08-23 21:29:53 UTC (rev 3780)
@@ -157,11 +157,11 @@
;; \
debian/$(libc).preinst) \
rtld=`LANG=C LC_ALL=C readelf -l debian/tmp-libc/usr/bin/iconv | grep "interpreter" | sed -e 's/.*interpreter: \(.*\)]/\1/g'`; \
- c_so=`ls debian/tmp-libc/lib/ | grep "libc\.so\."` ; \
- m_so=`ls debian/tmp-libc/lib/ | grep "libm\.so\."` ; \
- pthread_so=`ls debian/tmp-libc/lib/ | grep "libpthread\.so\."` || true; \
- rt_so=`ls debian/tmp-libc/lib/ | grep "librt\.so\."` ; \
- dl_so=`ls debian/tmp-libc/lib/ | grep "libdl\.so\."` ; \
+ c_so=`ls debian/tmp-libc/$(slibdir) | grep "libc\.so\."` ; \
+ m_so=`ls debian/tmp-libc/$(slibdir) | grep "libm\.so\."` ; \
+ pthread_so=`ls debian/tmp-libc/$(slibdir) | grep "libpthread\.so\."` || true; \
+ rt_so=`ls debian/tmp-libc/$(slibdir) | grep "librt\.so\."` ; \
+ dl_so=`ls debian/tmp-libc/$(slibdir) | grep "libdl\.so\."` ; \
sed -e "s#RTLD#$$rtld#" -e "s#C_SO#$$c_so#" -e "s#M_SO#$$m_so#" -e "s#PTHREAD_SO#$$pthread_so#" -e "s#RT_SO#$$rt_so#" -e "s#DL_SO#$$dl_so#" -i $$z ; \
;; \
esac; \
Modified: glibc-package/branches/multiarch/debian/sysdeps/amd64.mk
===================================================================
--- glibc-package/branches/multiarch/debian/sysdeps/amd64.mk 2009-08-23 16:27:53 UTC (rev 3779)
+++ glibc-package/branches/multiarch/debian/sysdeps/amd64.mk 2009-08-23 21:29:53 UTC (rev 3780)
@@ -1,5 +1,3 @@
-libc_slibdir = /lib
-libc_libdir = /usr/lib
libc_rtlddir = /lib64
# /lib64 and /usr/lib64 are provided by glibc instead base-files: #259302.
Reply to: