r1618 - in glibc-package: branches/glibc-2.4/debian branches/glibc-2.4/debian/debhelper.in branches/glibc-2.4/debian/rules.d trunk/debian trunk/debian/debhelper.in trunk/debian/rules.d
Author: aurel32
Date: 2006-06-05 15:08:55 +0000 (Mon, 05 Jun 2006)
New Revision: 1618
Modified:
glibc-package/branches/glibc-2.4/debian/changelog
glibc-package/branches/glibc-2.4/debian/debhelper.in/libc.preinst
glibc-package/branches/glibc-2.4/debian/rules.d/debhelper.mk
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/debhelper.in/libc.preinst
glibc-package/trunk/debian/rules.d/debhelper.mk
Log:
* debian/debhelper.in/libc.preinst: also check for other copies of the libc in
/lib32 and /lib64.
* debian/debhelper.in/libc.preinst, debian/rules.d/debhelper.mk: only use
the default system linker when searching for other copies of the libc.
Modified: glibc-package/branches/glibc-2.4/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.4/debian/changelog 2006-06-03 18:03:28 UTC (rev 1617)
+++ glibc-package/branches/glibc-2.4/debian/changelog 2006-06-05 15:08:55 UTC (rev 1618)
@@ -136,6 +136,10 @@
exist. (Closes: #370122)
* Update m68k/local-mathinline_h.diff (fix bits/mathinline.h), by Roger Leigh.
Enable it. (Closes: #340871)
+ * debian/debhelper.in/libc.preinst: also check for other copies of the libc in
+ /lib32 and /lib64.
+ * debian/debhelper.in/libc.preinst, debian/rules.d/debhelper.mk: only use
+ the default system linker when searching for other copies of the libc.
-- Aurelien Jarno <aurel32@debian.org> Sat, 3 Jun 2006 16:15:48 +0200
Modified: glibc-package/branches/glibc-2.4/debian/debhelper.in/libc.preinst
===================================================================
--- glibc-package/branches/glibc-2.4/debian/debhelper.in/libc.preinst 2006-06-03 18:03:28 UTC (rev 1617)
+++ glibc-package/branches/glibc-2.4/debian/debhelper.in/libc.preinst 2006-06-05 15:08:55 UTC (rev 1618)
@@ -139,16 +139,10 @@
do
if test -f "$dir/$lib"; then
libbytes=`head -c 20 $dir/$lib | od -c`
- for ld_so in $ld_so_list
- do
- if test -f "$ld_so"; then
- ldbytes=`head -c 20 $ld_so | od -c`
- if test "$ldbytes" = "$libbytes"; then
- echo "Matching libraries: $dir/$lib $ld_so"
- return 0
- fi
- fi
- done
+ if test "$ldbytes" = "$libbytes"; then
+ echo "Matching libraries: $dir/$lib"
+ return 0
+ fi
fi
done
fi
@@ -159,8 +153,8 @@
if [ "$1" != abort-upgrade ]
then
- ld_so_list=RTLDLIST
- dirs="/usr/local/lib /usr/local/lib32 /usr/local/lib64"
+ ldbytes=`head -c 20 RTLD | 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"
fi
Modified: glibc-package/branches/glibc-2.4/debian/rules.d/debhelper.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/rules.d/debhelper.mk 2006-06-03 18:03:28 UTC (rev 1617)
+++ glibc-package/branches/glibc-2.4/debian/rules.d/debhelper.mk 2006-06-05 15:08:55 UTC (rev 1618)
@@ -187,7 +187,7 @@
sed -e "s#DEB_HOST_ARCH#$(DEB_HOST_ARCH)#" -i $$z; \
case $$z in \
*.install) sed -e "s/^#.*//" -i $$z ;; \
- debian/$(libc).preinst) l=`grep ^RTLDLIST= debian/tmp-libc/usr/bin/ldd | sed -e 's/^RTLDLIST=//'`; sed -e "s#RTLDLIST#$$l#" -i $$z ;; \
+ debian/$(libc).preinst) l=`LANG=C LC_ALL=C readelf -l debian/tmp-libc/usr/bin/iconv | grep "interpreter" | sed -e 's/.*interpreter: \(.*\)]/\1/g'`; sed -e "s#RTLD#$$l#" -i $$z ;; \
esac; \
done
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2006-06-03 18:03:28 UTC (rev 1617)
+++ glibc-package/trunk/debian/changelog 2006-06-05 15:08:55 UTC (rev 1618)
@@ -7,6 +7,10 @@
exist. (Closes: #370122)
* Update m68k/local-mathinline_h.diff (fix bits/mathinline.h), by Roger Leigh.
Enable it. (Closes: #340871)
+ * debian/debhelper.in/libc.preinst: also check for other copies of the libc in
+ /lib32 and /lib64.
+ * debian/debhelper.in/libc.preinst, debian/rules.d/debhelper.mk: only use
+ the default system linker when searching for other copies of the libc.
-- Aurelien Jarno <aurel32@debian.org> Sat, 3 Jun 2006 16:15:48 +0200
Modified: glibc-package/trunk/debian/debhelper.in/libc.preinst
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc.preinst 2006-06-03 18:03:28 UTC (rev 1617)
+++ glibc-package/trunk/debian/debhelper.in/libc.preinst 2006-06-05 15:08:55 UTC (rev 1618)
@@ -139,16 +139,10 @@
do
if test -f "$dir/$lib"; then
libbytes=`head -c 20 $dir/$lib | od -c`
- for ld_so in $ld_so_list
- do
- if test -f "$ld_so"; then
- ldbytes=`head -c 20 $ld_so | od -c`
- if test "$ldbytes" = "$libbytes"; then
- echo "Matching libraries: $dir/$lib $ld_so"
- return 0
- fi
- fi
- done
+ if test "$ldbytes" = "$libbytes"; then
+ echo "Matching libraries: $dir/$lib"
+ return 0
+ fi
fi
done
fi
@@ -159,8 +153,8 @@
if [ "$1" != abort-upgrade ]
then
- ld_so_list=RTLDLIST
- dirs="/usr/local/lib /usr/local/lib32 /usr/local/lib64"
+ ldbytes=`head -c 20 RTLD | 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"
fi
Modified: glibc-package/trunk/debian/rules.d/debhelper.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/debhelper.mk 2006-06-03 18:03:28 UTC (rev 1617)
+++ glibc-package/trunk/debian/rules.d/debhelper.mk 2006-06-05 15:08:55 UTC (rev 1618)
@@ -187,7 +187,7 @@
sed -e "s#DEB_HOST_ARCH#$(DEB_HOST_ARCH)#" -i $$z; \
case $$z in \
*.install) sed -e "s/^#.*//" -i $$z ;; \
- debian/$(libc).preinst) l=`grep ^RTLDLIST= debian/tmp-libc/usr/bin/ldd | sed -e 's/^RTLDLIST=//'`; sed -e "s#RTLDLIST#$$l#" -i $$z ;; \
+ debian/$(libc).preinst) l=`LANG=C LC_ALL=C readelf -l debian/tmp-libc/usr/bin/iconv | grep "interpreter" | sed -e 's/.*interpreter: \(.*\)]/\1/g'`; sed -e "s#RTLD#$$l#" -i $$z ;; \
esac; \
done
Reply to: