Author: aurel32
Date: 2006-06-07 17:22:37 +0000 (Wed, 07 Jun 2006)
New Revision: 1629
Modified:
glibc-package/branches/glibc-2.4/debian/changelog
glibc-package/branches/glibc-2.4/debian/debhelper.in/libc-dev.install.hurd-i386
glibc-package/branches/glibc-2.4/debian/rules.d/debhelper.mk
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/debhelper.in/libc-dev.install.hurd-i386
glibc-package/trunk/debian/rules.d/debhelper.mk
Log:
* rules.d/debhelper.mk: don't install librpcsvc.a when cross-compiling.
(Closes: #369657)
Modified: glibc-package/branches/glibc-2.4/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.4/debian/changelog 2006-06-07 13:32:01 UTC
(rev 1628)
+++ glibc-package/branches/glibc-2.4/debian/changelog 2006-06-07 17:22:37 UTC
(rev 1629)
@@ -154,6 +154,8 @@
to fix the build with gcc-4.1.
* patches/m32r/local-ports-m32r.diff: remove libc_cv_gcc_unwind_find=yes
from m32r/configure by Kazuhiro Inaoka. (Closes: #371052)
+ * rules.d/debhelper.mk: don't install librpcsvc.a when cross-compiling.
+ (Closes: #369657)
[ Denis Barbier ]
* debian/main/control.in: make locales Conflicts: belocs-locales-data.
Modified:
glibc-package/branches/glibc-2.4/debian/debhelper.in/libc-dev.install.hurd-i386
===================================================================
---
glibc-package/branches/glibc-2.4/debian/debhelper.in/libc-dev.install.hurd-i386
2006-06-07 13:32:01 UTC (rev 1628)
+++
glibc-package/branches/glibc-2.4/debian/debhelper.in/libc-dev.install.hurd-i386
2006-06-07 17:22:37 UTC (rev 1629)
@@ -18,7 +18,7 @@
debian/tmp-libc/usr/lib/libmcheck.a usr/lib
debian/tmp-libc/usr/lib/libnsl.a usr/lib
debian/tmp-libc/usr/lib/libresolv.a usr/lib
-debian/tmp-libc/usr/lib/librpcsvc.a* usr/lib
+debian/tmp-libc/usr/lib/librpcsvc.a usr/lib
debian/tmp-libc/usr/lib/librt.a usr/lib
debian/tmp-libc/usr/lib/libutil.a usr/lib
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-07 13:32:01 UTC (rev 1628)
+++ glibc-package/branches/glibc-2.4/debian/rules.d/debhelper.mk
2006-06-07 17:22:37 UTC (rev 1629)
@@ -186,8 +186,16 @@
sed -e "s#EXIT_CHECK##" -i $$z; \
sed -e "s#DEB_HOST_ARCH#$(DEB_HOST_ARCH)#" -i $$z; \
case $$z in \
- *.install) sed -e "s/^#.*//" -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 ;; \
+ *.install) \
+ sed -e "s/^#.*//" -i $$z ; \
+ if [ $(DEB_HOST_ARCH) != $(DEB_BUILD_ARCH) ]; then \
+ sed -e "/^.*librpcsvc.a.*/d" $$z ; \
+ fi ; \
+ ;; \
+ 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-07 13:32:01 UTC (rev
1628)
+++ glibc-package/trunk/debian/changelog 2006-06-07 17:22:37 UTC (rev
1629)
@@ -19,6 +19,8 @@
to fix the build with gcc-4.1.
* patches/m32r/local-ports-m32r.diff: remove libc_cv_gcc_unwind_find=yes
from m32r/configure by Kazuhiro Inaoka. (Closes: #371052)
+ * rules.d/debhelper.mk: don't install librpcsvc.a when cross-compiling.
+ (Closes: #369657)
[ Denis Barbier ]
* debian/patches/localedata/tailor-iso14651_t1.diff: Fix several collation
Modified: glibc-package/trunk/debian/debhelper.in/libc-dev.install.hurd-i386
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc-dev.install.hurd-i386
2006-06-07 13:32:01 UTC (rev 1628)
+++ glibc-package/trunk/debian/debhelper.in/libc-dev.install.hurd-i386
2006-06-07 17:22:37 UTC (rev 1629)
@@ -18,7 +18,7 @@
debian/tmp-libc/usr/lib/libmcheck.a usr/lib
debian/tmp-libc/usr/lib/libnsl.a usr/lib
debian/tmp-libc/usr/lib/libresolv.a usr/lib
-debian/tmp-libc/usr/lib/librpcsvc.a* usr/lib
+debian/tmp-libc/usr/lib/librpcsvc.a usr/lib
debian/tmp-libc/usr/lib/librt.a usr/lib
debian/tmp-libc/usr/lib/libutil.a usr/lib
Modified: glibc-package/trunk/debian/rules.d/debhelper.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/debhelper.mk 2006-06-07 13:32:01 UTC
(rev 1628)
+++ glibc-package/trunk/debian/rules.d/debhelper.mk 2006-06-07 17:22:37 UTC
(rev 1629)
@@ -186,8 +186,16 @@
sed -e "s#EXIT_CHECK##" -i $$z; \
sed -e "s#DEB_HOST_ARCH#$(DEB_HOST_ARCH)#" -i $$z; \
case $$z in \
- *.install) sed -e "s/^#.*//" -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 ;; \
+ *.install) \
+ sed -e "s/^#.*//" -i $$z ; \
+ if [ $(DEB_HOST_ARCH) != $(DEB_BUILD_ARCH) ]; then \
+ sed -e "/^.*librpcsvc.a.*/d" $$z ; \
+ fi ; \
+ ;; \
+ 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
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
