Author: aurel32
Date: 2009-09-07 12:35:46 +0000 (Mon, 07 Sep 2009)
New Revision: 3802
Modified:
glibc-package/branches/multiarch/debian/debhelper.in/libc.preinst
glibc-package/branches/multiarch/debian/rules.d/debhelper.mk
Log:
Allow again replacement of library names in maintainer scripts
Modified: glibc-package/branches/multiarch/debian/debhelper.in/libc.preinst
===================================================================
--- glibc-package/branches/multiarch/debian/debhelper.in/libc.preinst
2009-09-07 06:30:26 UTC (rev 3801)
+++ glibc-package/branches/multiarch/debian/debhelper.in/libc.preinst
2009-09-07 12:35:46 UTC (rev 3802)
@@ -197,7 +197,7 @@
if [ "$type" != abort-upgrade ]
then
- ldbytes=`head -c 20 RTLD | od -c`
+ ldbytes=`head -c 20 RTLD_SO | od -c`
dirs="/lib32 /lib64 /usr/local/lib /usr/local/lib32 /usr/local/lib64"
if ! test -L /usr; then
dirs="$dirs /usr/lib /usr/lib32 /usr/lib64"
Modified: glibc-package/branches/multiarch/debian/rules.d/debhelper.mk
===================================================================
--- glibc-package/branches/multiarch/debian/rules.d/debhelper.mk
2009-09-07 06:30:26 UTC (rev 3801)
+++ glibc-package/branches/multiarch/debian/rules.d/debhelper.mk
2009-09-07 12:35:46 UTC (rev 3802)
@@ -173,6 +173,12 @@
libdir=$(call xx,libdir) ; \
slibdir=$(call xx,slibdir) ; \
curpass=$(curpass) ; \
+ c_so=`ls debian/tmp-$$curpass/$$slibdir | grep "libc\.so\."` ; \
+ m_so=`ls debian/tmp-$$curpass/$$slibdir | grep "libm\.so\."` ; \
+ rt_so=`ls debian/tmp-$$curpass/$$slibdir | grep "librt\.so\."` ; \
+ dl_so=`ls debian/tmp-$$curpass/$$slibdir | grep "libdl\.so\."` ; \
+ rtld_so=`LANG=C LC_ALL=C readelf -l debian/tmp-$$curpass/usr/bin/iconv
| grep "interpreter" | sed -e 's/.*interpreter: \(.*\)]/\1/g'`; \
+ pthread_so=`ls debian/tmp-$$curpass/$$slibdir | grep
"libpthread\.so\."` || true; \
case "$$curpass:$$slibdir" in \
libc:*) \
templates="libc libc-dev libc-pic libc-prof libc-udeb
libnss-dns-udeb libnss-files-udeb" \
@@ -200,6 +206,12 @@
sed -e "s#SLIBDIR#$$slibdir#g" -i $$t; \
sed -e "s#LIBDIR#$$libdir#g" -i $$t; \
sed -e "s#FLAVOR#$$curpass#g" -i $$t; \
+ sed -e "s#C_SO#$$c_so#" -i $$t ; \
+ sed -e "s#M_SO#$$m_so#" -i $$t ; \
+ sed -e "s#RT_SO#$$rt_so#" -i $$t ; \
+ sed -e "s#DL_SO#$$dl_so#" -i $$t ; \
+ sed -e "s#RTLD_SO#$$rtld_so#" -i $$t ; \
+ sed -e "s#PTHREAD_SO#$$pthread_so#" -i $$t ; \
done ; \
done
--
To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
