Author: vorlon Date: 2011-07-25 14:56:38 +0000 (Mon, 25 Jul 2011) New Revision: 4816
Modified: glibc-package/trunk/debian/changelog glibc-package/trunk/debian/control.in/amd64 glibc-package/trunk/debian/control.in/i386 glibc-package/trunk/debian/control.in/powerpc glibc-package/trunk/debian/control.in/ppc64 glibc-package/trunk/debian/control.in/s390 glibc-package/trunk/debian/control.in/s390x glibc-package/trunk/debian/control.in/sparc64 glibc-package/trunk/debian/rules.d/build.mk 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: Try again to make libc6-dev multiarch-same. Modified: glibc-package/trunk/debian/changelog =================================================================== --- glibc-package/trunk/debian/changelog 2011-07-23 21:45:51 UTC (rev 4815) +++ glibc-package/trunk/debian/changelog 2011-07-25 14:56:38 UTC (rev 4816) @@ -23,6 +23,9 @@ [ Jeremie Koenig ] * Add debian/libc0.3.symbols.hurd-i386. + [ Steve Langasek ] + * Try again to make libc6-dev multiarch-same. + -- Aurelien Jarno <[email protected]> Sun, 10 Jul 2011 22:01:11 +0200 eglibc (2.13-10) unstable; urgency=low Modified: glibc-package/trunk/debian/control.in/amd64 =================================================================== --- glibc-package/trunk/debian/control.in/amd64 2011-07-23 21:45:51 UTC (rev 4815) +++ glibc-package/trunk/debian/control.in/amd64 2011-07-25 14:56:38 UTC (rev 4816) @@ -15,7 +15,8 @@ Priority: optional Depends: libc6-amd64 (= ${binary:Version}), libc6-dev (= ${binary:Version}), ${misc:Depends} Recommends: gcc-multilib -Replaces: amd64-libs-dev (<= 1.2) +Conflicts: libc6-dev (<< 2.13-11) +Replaces: amd64-libs-dev (<= 1.2), libc6-dev (<< 2.13-11) Provides: lib64c-dev Description: Embedded GNU C Library: 64bit Development Libraries for AMD64 Contains the symlinks and object files needed to compile and link programs Modified: glibc-package/trunk/debian/control.in/i386 =================================================================== --- glibc-package/trunk/debian/control.in/i386 2011-07-23 21:45:51 UTC (rev 4815) +++ glibc-package/trunk/debian/control.in/i386 2011-07-25 14:56:38 UTC (rev 4816) @@ -15,7 +15,8 @@ Section: libdevel Priority: optional Provides: lib32c-dev -Conflicts: libc6-i386 (<= 2.9-18) +Conflicts: libc6-i386 (<= 2.9-18), libc6-dev (<< 2.13-11) +Replaces: libc6-dev (<< 2.13-11) Depends: libc6-i386 (= ${binary:Version}), libc6-dev (= ${binary:Version}), ${misc:Depends} Recommends: gcc-multilib Description: Embedded GNU C Library: 32-bit development libraries for AMD64 Modified: glibc-package/trunk/debian/control.in/powerpc =================================================================== --- glibc-package/trunk/debian/control.in/powerpc 2011-07-23 21:45:51 UTC (rev 4815) +++ glibc-package/trunk/debian/control.in/powerpc 2011-07-25 14:56:38 UTC (rev 4816) @@ -13,6 +13,8 @@ Section: libdevel Priority: optional Provides: lib32c-dev +Conflicts: libc6-dev (<< 2.13-11) +Replaces: libc6-dev (<< 2.13-11) Depends: libc6-powerpc (= ${binary:Version}), libc6-dev (= ${binary:Version}), ${misc:Depends} Recommends: gcc-multilib Description: Embedded GNU C Library: 32bit powerpc development libraries for ppc64 Modified: glibc-package/trunk/debian/control.in/ppc64 =================================================================== --- glibc-package/trunk/debian/control.in/ppc64 2011-07-23 21:45:51 UTC (rev 4815) +++ glibc-package/trunk/debian/control.in/ppc64 2011-07-25 14:56:38 UTC (rev 4816) @@ -13,6 +13,8 @@ Section: libdevel Priority: optional Provides: lib64c-dev +Conflicts: libc6-dev (<< 2.13-11) +Replaces: libc6-dev (<< 2.13-11) Depends: libc6-ppc64 (= ${binary:Version}), libc6-dev (= ${binary:Version}), ${misc:Depends} Recommends: gcc-multilib Description: Embedded GNU C Library: 64bit Development Libraries for PowerPC64 Modified: glibc-package/trunk/debian/control.in/s390 =================================================================== --- glibc-package/trunk/debian/control.in/s390 2011-07-23 21:45:51 UTC (rev 4815) +++ glibc-package/trunk/debian/control.in/s390 2011-07-25 14:56:38 UTC (rev 4816) @@ -13,6 +13,8 @@ Section: libdevel Priority: optional Provides: lib32c-dev +Conflicts: libc6-dev (<< 2.13-11) +Replaces: libc6-dev (<< 2.13-11) Depends: libc6-s390 (= ${binary:Version}), libc6-dev (= ${binary:Version}), ${misc:Depends} Recommends: gcc-multilib Description: Embedded GNU C Library: 32bit Development Libraries for IBM zSeries Modified: glibc-package/trunk/debian/control.in/s390x =================================================================== --- glibc-package/trunk/debian/control.in/s390x 2011-07-23 21:45:51 UTC (rev 4815) +++ glibc-package/trunk/debian/control.in/s390x 2011-07-25 14:56:38 UTC (rev 4816) @@ -13,6 +13,8 @@ Section: libdevel Priority: optional Provides: lib64c-dev +Conflicts: libc6-dev (<< 2.13-11) +Replaces: libc6-dev (<< 2.13-11) Depends: libc6-s390x (= ${binary:Version}), libc6-dev (= ${binary:Version}), ${misc:Depends} Recommends: gcc-multilib Description: Embedded GNU C Library: 64bit Development Libraries for IBM zSeries Modified: glibc-package/trunk/debian/control.in/sparc64 =================================================================== --- glibc-package/trunk/debian/control.in/sparc64 2011-07-23 21:45:51 UTC (rev 4815) +++ glibc-package/trunk/debian/control.in/sparc64 2011-07-25 14:56:38 UTC (rev 4816) @@ -14,6 +14,8 @@ Section: libdevel Priority: optional Provides: lib64c-dev +Conflicts: libc6-dev (<< 2.13-11) +Replaces: libc6-dev (<< 2.13-11) Depends: libc6-sparc64 (= ${binary:Version}), libc6-dev (= ${binary:Version}), ${misc:Depends} Recommends: gcc-multilib Description: Embedded GNU C Library: 64bit Development Libraries for UltraSPARC Modified: glibc-package/trunk/debian/rules.d/build.mk =================================================================== --- glibc-package/trunk/debian/rules.d/build.mk 2011-07-23 21:45:51 UTC (rev 4815) +++ glibc-package/trunk/debian/rules.d/build.mk 2011-07-25 14:56:38 UTC (rev 4816) @@ -160,6 +160,11 @@ echo "/lib/$(DEB_HOST_GNU_TYPE)" >> $$conffile; \ echo "/usr/lib/$(DEB_HOST_GNU_TYPE)" >> $$conffile; \ fi; \ + mkdir -p debian/tmp-$(curpass)/usr/include/$(DEB_HOST_MULTIARCH); \ + mv debian/tmp-$(curpass)/usr/include/bits debian/tmp-$(curpass)/usr/include/$(DEB_HOST_MULTIARCH); \ + mv debian/tmp-$(curpass)/usr/include/gnu debian/tmp-$(curpass)/usr/include/$(DEB_HOST_MULTIARCH); \ + mv debian/tmp-$(curpass)/usr/include/sys debian/tmp-$(curpass)/usr/include/$(DEB_HOST_MULTIARCH); \ + mv debian/tmp-$(curpass)/usr/include/fpu_control.h debian/tmp-$(curpass)/usr/include/$(DEB_HOST_MULTIARCH); \ fi # For our biarch libc, add an ld.so.conf.d configuration; this Modified: glibc-package/trunk/debian/sysdeps/amd64.mk =================================================================== --- glibc-package/trunk/debian/sysdeps/amd64.mk 2011-07-23 21:45:51 UTC (rev 4815) +++ glibc-package/trunk/debian/sysdeps/amd64.mk 2011-07-25 14:56:38 UTC (rev 4816) @@ -31,14 +31,10 @@ i386_libdir = /usr/lib32 define libc6-dev-i386_extra_pkg_install -mkdir -p debian/libc6-dev-i386/usr/include/gnu -cp -af debian/tmp-i386/usr/include/i486-linux-gnu/gnu/stubs-32.h \ - debian/libc6-dev-i386/usr/include/gnu -mkdir -p debian/libc6-dev-i386/usr/include/sys -cp -af debian/tmp-i386/usr/include/i486-linux-gnu/sys/elf.h \ - debian/libc6-dev-i386/usr/include/sys -cp -af debian/tmp-i386/usr/include/i486-linux-gnu/sys/vm86.h \ - debian/libc6-dev-i386/usr/include/sys +mkdir -p debian/libc6-dev-i386/usr/include +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 mkdir -p debian/libc6-dev-i386/usr/include/i486-linux-gnu endef Modified: glibc-package/trunk/debian/sysdeps/i386.mk =================================================================== --- glibc-package/trunk/debian/sysdeps/i386.mk 2011-07-23 21:45:51 UTC (rev 4815) +++ glibc-package/trunk/debian/sysdeps/i386.mk 2011-07-25 14:56:38 UTC (rev 4816) @@ -61,9 +61,10 @@ endef define libc6-dev-amd64_extra_pkg_install -mkdir -p debian/libc6-dev-amd64/usr/include/gnu -cp -af debian/tmp-amd64/usr/include/gnu/stubs-64.h \ - debian/libc6-dev-amd64/usr/include/gnu +mkdir -p debian/libc6-dev-amd64/usr/include +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 mkdir -p debian/libc6-dev-amd64/usr/include/x86_64-linux-gnu endef Modified: glibc-package/trunk/debian/sysdeps/powerpc.mk =================================================================== --- glibc-package/trunk/debian/sysdeps/powerpc.mk 2011-07-23 21:45:51 UTC (rev 4815) +++ glibc-package/trunk/debian/sysdeps/powerpc.mk 2011-07-25 14:56:38 UTC (rev 4816) @@ -15,9 +15,10 @@ ppc64_includedir = /usr/include/powerpc64-linux-gnu define libc6-dev-ppc64_extra_pkg_install -mkdir -p debian/libc6-dev-ppc64/usr/include/gnu -cp -af debian/tmp-ppc64/usr/include/powerpc64-linux-gnu/gnu/stubs-64.h \ - debian/libc6-dev-ppc64/usr/include/gnu +mkdir -p debian/libc6-dev-ppc64/usr/include +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 mkdir -p debian/libc6-dev-ppc64/usr/include/powerpc64-linux-gnu endef Modified: glibc-package/trunk/debian/sysdeps/ppc64.mk =================================================================== --- glibc-package/trunk/debian/sysdeps/ppc64.mk 2011-07-23 21:45:51 UTC (rev 4815) +++ glibc-package/trunk/debian/sysdeps/ppc64.mk 2011-07-25 14:56:38 UTC (rev 4816) @@ -21,9 +21,10 @@ powerpc_libdir = /usr/lib32 define libc6-dev-powerpc_extra_pkg_install -mkdir -p debian/libc6-dev-powerpc/usr/include/gnu -cp -af debian/tmp-powerpc/usr/include/powerpc-linux-gnu/gnu/stubs-32.h \ - debian/libc6-dev-powerpc/usr/include/gnu +mkdir -p debian/libc6-dev-powerpc/usr/include +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 mkdir -p debian/libc6-dev-powerpc/usr/include/powerpc-linux-gnu endef Modified: glibc-package/trunk/debian/sysdeps/s390.mk =================================================================== --- glibc-package/trunk/debian/sysdeps/s390.mk 2011-07-23 21:45:51 UTC (rev 4815) +++ glibc-package/trunk/debian/sysdeps/s390.mk 2011-07-25 14:56:38 UTC (rev 4816) @@ -13,9 +13,10 @@ s390x_libdir = /usr/lib64 define libc6-dev-s390x_extra_pkg_install -mkdir -p debian/libc6-dev-s390x/usr/include/gnu -cp -af debian/tmp-s390x/usr/include/s390x-linux-gnu/gnu/stubs-64.h \ - debian/libc6-dev-s390x/usr/include/gnu +mkdir -p debian/libc6-dev-s390x/usr/include +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 mkdir -p debian/libc6-dev-s390x/usr/include/s390x-linux-gnu endef Modified: glibc-package/trunk/debian/sysdeps/s390x.mk =================================================================== --- glibc-package/trunk/debian/sysdeps/s390x.mk 2011-07-23 21:45:51 UTC (rev 4815) +++ glibc-package/trunk/debian/sysdeps/s390x.mk 2011-07-25 14:56:38 UTC (rev 4816) @@ -19,9 +19,10 @@ s390_libdir = /usr/lib32 define libc6-dev-s390_extra_pkg_install -mkdir -p debian/libc6-dev-s390/usr/include/gnu -cp -af debian/tmp-s390/usr/include/s390-linux-gnu/gnu/stubs-32.h \ - debian/libc6-dev-s390/usr/include/gnu +mkdir -p debian/libc6-dev-s390/usr/include/ +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 mkdir -p debian/libc6-dev-s390/usr/include/s390-linux-gnu endef Modified: glibc-package/trunk/debian/sysdeps/sparc.mk =================================================================== --- glibc-package/trunk/debian/sysdeps/sparc.mk 2011-07-23 21:45:51 UTC (rev 4815) +++ glibc-package/trunk/debian/sysdeps/sparc.mk 2011-07-25 14:56:38 UTC (rev 4816) @@ -15,8 +15,9 @@ sparc64_libdir = /usr/lib64 define libc6-dev-sparc64_extra_pkg_install -mkdir -p debian/libc6-dev-sparc64/usr/include/gnu -cp -af debian/tmp-sparc64/usr/include/sparc64-linux-gnu/gnu/stubs-64.h \ - debian/libc6-dev-sparc64/usr/include/gnu +mkdir -p debian/libc6-dev-sparc64/usr/include +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 mkdir -p debian/libc6-dev-sparc64/usr/include/sparc64-linux-gnu endef -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
