r3799 - in glibc-package/branches/multiarch/debian: debhelper.in rules.d
Author: aurel32
Date: 2009-09-04 21:01:08 +0000 (Fri, 04 Sep 2009)
New Revision: 3799
Modified:
glibc-package/branches/multiarch/debian/debhelper.in/libc-dev.install
glibc-package/branches/multiarch/debian/debhelper.in/libc-prof.install
glibc-package/branches/multiarch/debian/debhelper.in/libc-udeb.install
glibc-package/branches/multiarch/debian/debhelper.in/libc.install
glibc-package/branches/multiarch/debian/debhelper.in/libc.lintian-overrides
glibc-package/branches/multiarch/debian/debhelper.in/libnss-dns-udeb.install
glibc-package/branches/multiarch/debian/debhelper.in/libnss-files-udeb.install
glibc-package/branches/multiarch/debian/rules.d/debhelper.mk
Log:
Also use LIBDIR/SLIBDIR for the main libc
Modified: glibc-package/branches/multiarch/debian/debhelper.in/libc-dev.install
===================================================================
--- glibc-package/branches/multiarch/debian/debhelper.in/libc-dev.install 2009-09-04 19:45:40 UTC (rev 3798)
+++ glibc-package/branches/multiarch/debian/debhelper.in/libc-dev.install 2009-09-04 21:01:08 UTC (rev 3799)
@@ -1,22 +1,21 @@
-debian/tmp-libc/usr/lib/libanl.a usr/lib
-debian/tmp-libc/usr/lib/libBrokenLocale.a usr/lib
-debian/tmp-libc/usr/lib/libbsd-compat.a usr/lib
-debian/tmp-libc/usr/lib/libc.a usr/lib
-debian/tmp-libc/usr/lib/libc_nonshared.a usr/lib
-debian/tmp-libc/usr/lib/libcrypt.a usr/lib
-debian/tmp-libc/usr/lib/libdl.a usr/lib
-debian/tmp-libc/usr/lib/libg.a usr/lib
-debian/tmp-libc/usr/lib/libieee.a usr/lib
-debian/tmp-libc/usr/lib/libm.a usr/lib
-debian/tmp-libc/usr/lib/libmcheck.a usr/lib
-debian/tmp-libc/usr/lib/libnsl.a usr/lib
-debian/tmp-libc/usr/lib/libpthread.a usr/lib
-debian/tmp-libc/usr/lib/libpthread_nonshared.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/librt.a usr/lib
-debian/tmp-libc/usr/lib/libutil.a usr/lib
-
-debian/tmp-libc/usr/lib/*.o usr/lib
-debian/tmp-libc/usr/lib/*.so usr/lib
-debian/tmp-libc/usr/include/* usr/include
+TMPDIR/LIBDIR/libanl.a LIBDIR
+TMPDIR/LIBDIR/libBrokenLocale.a LIBDIR
+TMPDIR/LIBDIR/libbsd-compat.a LIBDIR
+TMPDIR/LIBDIR/libc.a LIBDIR
+TMPDIR/LIBDIR/libc_nonshared.a LIBDIR
+TMPDIR/LIBDIR/libcrypt.a LIBDIR
+TMPDIR/LIBDIR/libdl.a LIBDIR
+TMPDIR/LIBDIR/libg.a LIBDIR
+TMPDIR/LIBDIR/libieee.a LIBDIR
+TMPDIR/LIBDIR/libm.a LIBDIR
+TMPDIR/LIBDIR/libmcheck.a LIBDIR
+TMPDIR/LIBDIR/libnsl.a LIBDIR
+TMPDIR/LIBDIR/libpthread.a LIBDIR
+TMPDIR/LIBDIR/libpthread_nonshared.a LIBDIR
+TMPDIR/LIBDIR/libresolv.a LIBDIR
+TMPDIR/LIBDIR/librpcsvc.a LIBDIR
+TMPDIR/LIBDIR/librt.a LIBDIR
+TMPDIR/LIBDIR/libutil.a LIBDIR
+TMPDIR/LIBDIR/*.o LIBDIR
+TMPDIR/LIBDIR/*.so LIBDIR
+TMPDIR/usr/include/* usr/include
Modified: glibc-package/branches/multiarch/debian/debhelper.in/libc-prof.install
===================================================================
--- glibc-package/branches/multiarch/debian/debhelper.in/libc-prof.install 2009-09-04 19:45:40 UTC (rev 3798)
+++ glibc-package/branches/multiarch/debian/debhelper.in/libc-prof.install 2009-09-04 21:01:08 UTC (rev 3799)
@@ -1 +1 @@
-debian/tmp-libc/usr/lib/*_p.a usr/lib
+TMPDIR/LIBDIR/*_p.a LIBDIR
Modified: glibc-package/branches/multiarch/debian/debhelper.in/libc-udeb.install
===================================================================
--- glibc-package/branches/multiarch/debian/debhelper.in/libc-udeb.install 2009-09-04 19:45:40 UTC (rev 3798)
+++ glibc-package/branches/multiarch/debian/debhelper.in/libc-udeb.install 2009-09-04 21:01:08 UTC (rev 3799)
@@ -1,13 +1,13 @@
# FIXME: someday we may need to handle installing into non-lib.
-debian/tmp-libc/lib/ld*.so* lib
-debian/tmp-libc/lib/libm-*.so* lib
-debian/tmp-libc/lib/libm.so* lib
-debian/tmp-libc/lib/libdl*.so* lib
-debian/tmp-libc/lib/libresolv*.so* lib
-debian/tmp-libc/lib/libc-*.so* lib
-debian/tmp-libc/lib/libc.so* lib
-debian/tmp-libc/lib/libutil* lib
-debian/tmp-libc/lib/libcrypt* lib
-debian/tmp-libc/lib/librt*.so* lib
-debian/tmp-libc/lib/libpthread*.so* lib
+TMPDIR/SLIBDIR/ld*.so* lib
+TMPDIR/SLIBDIR/libm-*.so* lib
+TMPDIR/SLIBDIR/libm.so* lib
+TMPDIR/SLIBDIR/libdl*.so* lib
+TMPDIR/SLIBDIR/libresolv*.so* lib
+TMPDIR/SLIBDIR/libc-*.so* lib
+TMPDIR/SLIBDIR/libc.so* lib
+TMPDIR/SLIBDIR/libutil* lib
+TMPDIR/SLIBDIR/libcrypt* lib
+TMPDIR/SLIBDIR/librt*.so* lib
+TMPDIR/SLIBDIR/libpthread*.so* lib
Modified: glibc-package/branches/multiarch/debian/debhelper.in/libc.install
===================================================================
--- glibc-package/branches/multiarch/debian/debhelper.in/libc.install 2009-09-04 19:45:40 UTC (rev 3798)
+++ glibc-package/branches/multiarch/debian/debhelper.in/libc.install 2009-09-04 21:01:08 UTC (rev 3799)
@@ -1,10 +1,7 @@
-debian/tmp-libc/lib/*.so* lib
-debian/tmp-libc/usr/lib/gconv/*.so usr/lib/gconv
-debian/tmp-libc/usr/lib/gconv/gconv-modules usr/lib/gconv
+TMPDIR/SLIBDIR/*.so* SLIBDIR
+TMPDIR/LIBDIR/gconv/*.so LIBDIR/gconv
+TMPDIR/LIBDIR/gconv/gconv-modules LIBDIR/gconv
-debian/tmp-libc/lib/*-*-gnu*/ lib
-debian/tmp-libc/usr/lib/*-*-gnu*/ usr/lib
+TMPDIR/etc/ld.so.conf.d /etc
-debian/tmp-libc/etc/ld.so.conf.d /etc
-
BUILD-TREE/test-results-*-libc usr/share/doc/LIBC
Modified: glibc-package/branches/multiarch/debian/debhelper.in/libc.lintian-overrides
===================================================================
--- glibc-package/branches/multiarch/debian/debhelper.in/libc.lintian-overrides 2009-09-04 19:45:40 UTC (rev 3798)
+++ glibc-package/branches/multiarch/debian/debhelper.in/libc.lintian-overrides 2009-09-04 21:01:08 UTC (rev 3799)
@@ -1,13 +1,13 @@
# libpthread must be stripped specially; GDB needs the non-dynamic
# symbol table in order to load the thread debugging library.
-LIBC: unstripped-binary-or-object ./lib/libpthread-2.9.so
+LIBC: unstripped-binary-or-object .SLIBDIR/libpthread-2.9.so
# ld.so must be executable, otherwise the system will not work
-LIBC: shlib-with-executable-bit lib/ld-2.9.so 0755
+LIBC: shlib-with-executable-bit .LIBDIR/ld-2.9.so 0755
# It is normal that the ELF dynamic linker does not need any other
# library
-LIBC: shared-lib-without-dependency-information ./lib/ld-2.9.so
+LIBC: shared-lib-without-dependency-information .LIBDIR/ld-2.9.so
# dependency on debconf is not needed, as glibc has a fallback to tty
LIBC: missing-debconf-dependency-for-preinst
Modified: glibc-package/branches/multiarch/debian/debhelper.in/libnss-dns-udeb.install
===================================================================
--- glibc-package/branches/multiarch/debian/debhelper.in/libnss-dns-udeb.install 2009-09-04 19:45:40 UTC (rev 3798)
+++ glibc-package/branches/multiarch/debian/debhelper.in/libnss-dns-udeb.install 2009-09-04 21:01:08 UTC (rev 3799)
@@ -1,3 +1,3 @@
# FIXME: someday we may need to handle installing into non-lib.
-debian/tmp-libc/lib/libnss_dns*.so* lib
+TMPDIR/SLIBDIR/libnss_dns*.so* lib
Modified: glibc-package/branches/multiarch/debian/debhelper.in/libnss-files-udeb.install
===================================================================
--- glibc-package/branches/multiarch/debian/debhelper.in/libnss-files-udeb.install 2009-09-04 19:45:40 UTC (rev 3798)
+++ glibc-package/branches/multiarch/debian/debhelper.in/libnss-files-udeb.install 2009-09-04 21:01:08 UTC (rev 3799)
@@ -1,3 +1,3 @@
# FIXME: someday we may need to handle installing into non-lib.
-debian/tmp-libc/lib/libnss_files*.so* lib
+TMPDIR/SLIBDIR/libnss_files*.so* lib
Modified: glibc-package/branches/multiarch/debian/rules.d/debhelper.mk
===================================================================
--- glibc-package/branches/multiarch/debian/rules.d/debhelper.mk 2009-09-04 19:45:40 UTC (rev 3798)
+++ glibc-package/branches/multiarch/debian/rules.d/debhelper.mk 2009-09-04 21:01:08 UTC (rev 3799)
@@ -175,7 +175,7 @@
curpass=$(curpass) ; \
case "$$curpass:$$slibdir" in \
libc:*) \
- templates="libc libc-dev libc-pic libc-prof libc-udeb" \
+ templates="libc libc-dev libc-pic libc-prof libc-udeb libnss-dns-udeb libnss-files-udeb" \
pass="" \
suffix="" \
;; \
@@ -192,8 +192,10 @@
esac ; \
for t in $$templates ; do \
for s in debian/$$t$$pass.* ; do \
- t=`echo $$s | sed -e "s#libc#$(libc)#"`$$suffx ; \
- cp $$s $$t ; \
+ t=`echo $$s | sed -e "s#libc#$(libc)#"`$$suffix ; \
+ if [ "$$s" != "$$t" ] ; then \
+ cp $$s $$t ; \
+ fi ; \
sed -e "s#TMPDIR#debian/tmp-$$curpass#g" -i $$t; \
sed -e "s#SLIBDIR#$$slibdir#g" -i $$t; \
sed -e "s#LIBDIR#$$libdir#g" -i $$t; \
Reply to: