Author: vorlon Date: 2011-07-25 18:57:55 +0000 (Mon, 25 Jul 2011) New Revision: 4817
Modified: glibc-package/trunk/debian/sysdeps/amd64.mk glibc-package/trunk/debian/sysdeps/i386.mk glibc-package/trunk/debian/sysdeps/powerpc.mk glibc-package/trunk/debian/sysdeps/ppc64.mk glibc-package/trunk/debian/sysdeps/s390.mk glibc-package/trunk/debian/sysdeps/s390x.mk glibc-package/trunk/debian/sysdeps/sparc.mk Log: refine the biarch munging to make sure gnu/stubs-* still get included Modified: glibc-package/trunk/debian/sysdeps/amd64.mk =================================================================== --- glibc-package/trunk/debian/sysdeps/amd64.mk 2011-07-25 14:56:38 UTC (rev 4816) +++ glibc-package/trunk/debian/sysdeps/amd64.mk 2011-07-25 18:57:55 UTC (rev 4817) @@ -31,7 +31,8 @@ i386_libdir = /usr/lib32 define libc6-dev-i386_extra_pkg_install -mkdir -p debian/libc6-dev-i386/usr/include +mkdir -p debian/libc6-dev-i386/usr/include/x86_64-linux-gnu/gnu +cp -a debian/tmp-i386/usr/include/gnu/stubs-32.h debian/libc6-dev-i386/usr/include/x86_64-linux-gnu/gnu/ ln -s x86_64-linux-gnu/gnu debian/libc6-dev-i386/usr/include/gnu ln -s x86_64-linux-gnu/sys debian/libc6-dev-i386/usr/include/sys ln -s x86_64-linux-gnu/bits debian/libc6-dev-i386/usr/include/bits Modified: glibc-package/trunk/debian/sysdeps/i386.mk =================================================================== --- glibc-package/trunk/debian/sysdeps/i386.mk 2011-07-25 14:56:38 UTC (rev 4816) +++ glibc-package/trunk/debian/sysdeps/i386.mk 2011-07-25 18:57:55 UTC (rev 4817) @@ -61,7 +61,8 @@ endef define libc6-dev-amd64_extra_pkg_install -mkdir -p debian/libc6-dev-amd64/usr/include +mkdir -p debian/libc6-dev-amd64/usr/include/i386-linux-gnu/gnu +cp -a debian/tmp-amd64/usr/include/gnu/stubs-64.h debian/libc6-dev-amd64/usr/include/i386-linux-gnu/gnu ln -s i386-linux-gnu/gnu debian/libc6-dev-amd64/usr/include/gnu ln -s i386-linux-gnu/sys debian/libc6-dev-amd64/usr/include/sys ln -s i386-linux-gnu/bits debian/libc6-dev-amd64/usr/include/bits Modified: glibc-package/trunk/debian/sysdeps/powerpc.mk =================================================================== --- glibc-package/trunk/debian/sysdeps/powerpc.mk 2011-07-25 14:56:38 UTC (rev 4816) +++ glibc-package/trunk/debian/sysdeps/powerpc.mk 2011-07-25 18:57:55 UTC (rev 4817) @@ -15,7 +15,8 @@ ppc64_includedir = /usr/include/powerpc64-linux-gnu define libc6-dev-ppc64_extra_pkg_install -mkdir -p debian/libc6-dev-ppc64/usr/include +mkdir -p debian/libc6-dev-ppc64/usr/include/powerpc-linux-gnu/gnu +cp -a debian/tmp-ppc64/usr/include/gnu/stubs-64.h debian/libc6-dev-ppc64/usr/include/powerpc-linux-gnu/gnu ln -s powerpc-linux-gnu/gnu debian/libc6-dev-ppc64/usr/include/gnu ln -s powerpc-linux-gnu/sys debian/libc6-dev-ppc64/usr/include/sys ln -s powerpc-linux-gnu/bits debian/libc6-dev-ppc64/usr/include/bits Modified: glibc-package/trunk/debian/sysdeps/ppc64.mk =================================================================== --- glibc-package/trunk/debian/sysdeps/ppc64.mk 2011-07-25 14:56:38 UTC (rev 4816) +++ glibc-package/trunk/debian/sysdeps/ppc64.mk 2011-07-25 18:57:55 UTC (rev 4817) @@ -21,7 +21,8 @@ powerpc_libdir = /usr/lib32 define libc6-dev-powerpc_extra_pkg_install -mkdir -p debian/libc6-dev-powerpc/usr/include +mkdir -p debian/libc6-dev-powerpc/usr/include/powerpc64-linux-gnu/gnu +cp -a debian/tmp-powerpc/usr/include/gnu/stubs-32.h debian/libc6-dev-powerpc/usr/include/powerpc64-linux-gnu/gnu ln -s powerpc64-linux-gnu/gnu debian/libc6-dev-powerpc/usr/include/gnu ln -s powerpc64-linux-gnu/sys debian/libc6-dev-powerpc/usr/include/sys ln -s powerpc64-linux-gnu/bits debian/libc6-dev-powerpc/usr/include/bits Modified: glibc-package/trunk/debian/sysdeps/s390.mk =================================================================== --- glibc-package/trunk/debian/sysdeps/s390.mk 2011-07-25 14:56:38 UTC (rev 4816) +++ glibc-package/trunk/debian/sysdeps/s390.mk 2011-07-25 18:57:55 UTC (rev 4817) @@ -13,7 +13,8 @@ s390x_libdir = /usr/lib64 define libc6-dev-s390x_extra_pkg_install -mkdir -p debian/libc6-dev-s390x/usr/include +mkdir -p debian/libc6-dev-s390x/usr/include/s390-linux-gnu/gnu +cp -a debian/tmp-s390x/usr/include/gnu/stubs-64.h debian/libc6-dev-s390x/usr/include/s390-linux-gnu/gnu ln -s s390-linux-gnu/gnu debian/libc6-dev-s390x/usr/include/gnu ln -s s390-linux-gnu/sys debian/libc6-dev-s390x/usr/include/sys ln -s s390-linux-gnu/bits debian/libc6-dev-s390x/usr/include/bits Modified: glibc-package/trunk/debian/sysdeps/s390x.mk =================================================================== --- glibc-package/trunk/debian/sysdeps/s390x.mk 2011-07-25 14:56:38 UTC (rev 4816) +++ glibc-package/trunk/debian/sysdeps/s390x.mk 2011-07-25 18:57:55 UTC (rev 4817) @@ -19,7 +19,8 @@ s390_libdir = /usr/lib32 define libc6-dev-s390_extra_pkg_install -mkdir -p debian/libc6-dev-s390/usr/include/ +mkdir -p debian/libc6-dev-s390/usr/include/s390x-linux-gnu/gnu +cp -a debian/tmp-s390/usr/include/gnu/stubs-32.h debian/libc6-dev-s390/usr/include/s390x-linux-gnu/gnu ln -s s390x-linux-gnu/gnu debian/libc6-dev-s390/usr/include/gnu ln -s s390x-linux-gnu/sys debian/libc6-dev-s390/usr/include/sys ln -s s390x-linux-gnu/bits debian/libc6-dev-s390/usr/include/bits Modified: glibc-package/trunk/debian/sysdeps/sparc.mk =================================================================== --- glibc-package/trunk/debian/sysdeps/sparc.mk 2011-07-25 14:56:38 UTC (rev 4816) +++ glibc-package/trunk/debian/sysdeps/sparc.mk 2011-07-25 18:57:55 UTC (rev 4817) @@ -15,7 +15,8 @@ sparc64_libdir = /usr/lib64 define libc6-dev-sparc64_extra_pkg_install -mkdir -p debian/libc6-dev-sparc64/usr/include +mkdir -p debian/libc6-dev-sparc64/usr/include/sparc-linux-gnu/gnu +cp -a debian/tmp-sparc64/usr/include/gnu/stubs-64.h debian/libc6-dev-sparc64/usr/include/sparc-linux-gnu/gnu ln -s sparc-linux-gnu/gnu debian/libc6-dev-sparc64/usr/include/gnu ln -s sparc-linux-gnu/sys debian/libc6-dev-sparc64/usr/include/sys ln -s sparc-linux-gnu/bits debian/libc6-dev-sparc64/usr/include/bits -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
