r4802 - in glibc-package/trunk/debian: . rules.d
Author: aurel32
Date: 2011-07-21 12:57:01 +0000 (Thu, 21 Jul 2011)
New Revision: 4802
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/rules.d/debhelper.mk
Log:
* Disable multiarch support on amd64, kfreebsd-amd64, ppc64, sparc64 until
we fix the /lib64 -> /lib symlink issue. Closes: #632176.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2011-07-19 13:17:18 UTC (rev 4801)
+++ glibc-package/trunk/debian/changelog 2011-07-21 12:57:01 UTC (rev 4802)
@@ -1,5 +1,6 @@
eglibc (2.13-11) UNRELEASED; urgency=low
+ [ Aurelien Jarno ]
* control.in/main: fix nscd description. Closes: #633370.
* Update patches/svn-updates to revision 14511 to fix build on
powerpcspe. Add corresponding symbols file and expected testsuite
@@ -10,6 +11,8 @@
- fixes LD_PRELOAD with a kfreebsd-9 kernel. Closes: #630695.
- fixes tst-atime when build in a noatime filesystem. Closes: #634152.
- uses upstream RFTSIGZMB for exit signal selection when available.
+ * Disable multiarch support on amd64, kfreebsd-amd64, ppc64, sparc64 until
+ we fix the /lib64 -> /lib symlink issue. Closes: #632176.
-- Aurelien Jarno <aurel32@debian.org> Sun, 10 Jul 2011 22:01:11 +0200
Modified: glibc-package/trunk/debian/rules.d/debhelper.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/debhelper.mk 2011-07-19 13:17:18 UTC (rev 4801)
+++ glibc-package/trunk/debian/rules.d/debhelper.mk 2011-07-21 12:57:01 UTC (rev 4802)
@@ -109,7 +109,19 @@
dh_installdeb -p$(curpass)
dh_shlibdeps -p$(curpass)
- dh_gencontrol -p$(curpass)
+
+ #
+ # Disable multiarch support on some architectures until we fix the /lib64 -> /lib issue
+ #
+ case $(curpass)/$(DEB_HOST_ARCH) in
+ libc6/amd64 | libc6/kfreebsd-amd64 | libc6/ppc64 | libc6/sparc64)
+ dh_gencontrol -p$(curpass) -- -UMulti-Arch
+ ;;
+ *)
+ dh_gencontrol -p$(curpass)
+ ;;
+ esac
+
if [ $(curpass) = nscd ] ; then \
sed -i -e "s/\(Depends:.*libc[0-9.]\+\)-[a-z0-9]\+/\1/" debian/nscd/DEBIAN/control ; \
fi
Reply to: