r3397 - in glibc-package/trunk/debian: . rules.d
Author: sthibaul-guest
Date: 2009-04-04 08:24:18 +0000 (Sat, 04 Apr 2009)
New Revision: 3397
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/rules.d/debhelper.mk
Log:
* debian/rules.d/debhelper.mk: let grep libpthread.so fail because on
hurd-i386 glibc does not provide it.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2009-03-31 18:07:48 UTC (rev 3396)
+++ glibc-package/trunk/debian/changelog 2009-04-04 08:24:18 UTC (rev 3397)
@@ -1,5 +1,6 @@
glibc (2.9-7) unstable; urgency=low
+ [ Aurelien Jarno ]
* Update German debconf translation, by Helge Kreutzman. Closes: #519992.
* Update testsuite results on alpha, tst-timer.out exits with SIGILL on
some machines, it was already the case with glibc 2.7 on the same
@@ -10,6 +11,10 @@
* kfreebsd/local-sysdeps.diff: update to revision 2379 (from glibc-bsd).
* libc6.1.symbols.alpha: fix package name for private symbols.
+ [ Samuel Thibault ]
+ * debian/rules.d/debhelper.mk: let grep libpthread.so fail because on
+ hurd-i386 glibc does not provide it.
+
-- Aurelien Jarno <aurel32@debian.org> Fri, 20 Mar 2009 12:28:48 +0100
glibc (2.9-6) unstable; urgency=low
Modified: glibc-package/trunk/debian/rules.d/debhelper.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/debhelper.mk 2009-03-31 18:07:48 UTC (rev 3396)
+++ glibc-package/trunk/debian/rules.d/debhelper.mk 2009-04-04 08:24:18 UTC (rev 3397)
@@ -174,7 +174,7 @@
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\."` ; \
+ 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\."` ; \
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 ; \
Reply to: