On Mon, Apr 21, 2014 at 07:58:51AM +0200, Helmut Grohne wrote:
Please consider the attached patch to achieve this goal.
Please find an updated patch attached. Changes since last version:
* Add Build-Profiles headers to binary packages.
* Don't treat optimized packages (e.g. i686) as multilib (thanks to
Aurelien Jarno).
* Introduce GLIBC_MULTILIB_PASSES to work the same way as
DEB_ARCH_MULTILIB_PACKAGES (thanks to Aurelien Jarno).
* Support new architectures (mips*).
Helmut
diff -Nru glibc-2.19/debian/changelog glibc-2.19/debian/changelog
--- glibc-2.19/debian/changelog 2014-07-13 01:31:22.0 +0200
+++ glibc-2.19/debian/changelog 2014-07-19 07:38:01.0 +0200
@@ -1,3 +1,11 @@
+glibc (2.19-7.1) UNRELEASED; urgency=low
+
+ * Non-maintainer upload.
+ * Add a nobiarch build profile that inhibits all multilib packages from
+being built. (Closes: #745380)
+
+ -- Helmut Grohne hel...@subdivi.de Sat, 19 Jul 2014 07:37:22 +0200
+
glibc (2.19-7) unstable; urgency=high
* debian/patches/localedata/unsubmitted-tst-setlocale3-ENV.diff: Apply
diff -Nru glibc-2.19/debian/control.in/amd64 glibc-2.19/debian/control.in/amd64
--- glibc-2.19/debian/control.in/amd64 2014-06-27 04:28:51.0 +0200
+++ glibc-2.19/debian/control.in/amd64 2014-07-19 07:53:34.0 +0200
@@ -4,7 +4,7 @@
Priority: optional
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
Conflicts: amd64-libs (= 1.2)
-Build-Profiles: !stage1
+Build-Profiles: !stage1 !nobiarch
Description: GNU C Library: 64bit Shared libraries for AMD64
This package includes shared versions of the standard C library and the
standard math library, as well as many others. This is the 64bit version
@@ -19,6 +19,7 @@
Conflicts: libc6-dev ( 2.13-14)
Replaces: amd64-libs-dev (= 1.2), libc6-dev ( 2.13-11)
Provides: lib64c-dev
+Build-Profiles: !nobiarch
Description: GNU C Library: 64bit Development Libraries for AMD64
Contains the symlinks and object files needed to compile and link programs
which use the standard C library. This is the 64bit version of the
diff -Nru glibc-2.19/debian/control.in/armel glibc-2.19/debian/control.in/armel
--- glibc-2.19/debian/control.in/armel 2014-06-27 04:28:51.0 +0200
+++ glibc-2.19/debian/control.in/armel 2014-07-19 07:53:48.0 +0200
@@ -3,7 +3,7 @@
Section: libs
Priority: optional
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
-Build-Profiles: !stage1
+Build-Profiles: !stage1 !nobiarch
Description: GNU C Library: ARM softfp shared libraries for armhf
This package includes shared versions of the standard C
library and the standard math library, as well as many others.
@@ -15,6 +15,7 @@
Priority: optional
Depends: libc6-armel (= ${binary:Version}), libc6-dev (= ${binary:Version}),
${misc:Depends}
Recommends: gcc-multilib
+Build-Profiles: !nobiarch
Description: GNU C Library: ARM softfp development libraries for armhf
Contains the symlinks and object files needed to compile and link programs
which use the standard C library. This is the ARM softfp version of the
diff -Nru glibc-2.19/debian/control.in/armhf glibc-2.19/debian/control.in/armhf
--- glibc-2.19/debian/control.in/armhf 2014-06-27 04:28:51.0 +0200
+++ glibc-2.19/debian/control.in/armhf 2014-07-19 07:54:00.0 +0200
@@ -3,7 +3,7 @@
Section: libs
Priority: optional
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
-Build-Profiles: !stage1
+Build-Profiles: !stage1 !nobiarch
Description: GNU C Library: ARM hard float shared libraries for armel
This package includes shared versions of the standard C
library and the standard math library, as well as many others.
@@ -15,6 +15,7 @@
Priority: optional
Depends: libc6-armhf (= ${binary:Version}), libc6-dev (= ${binary:Version}),
${misc:Depends}
Recommends: gcc-multilib
+Build-Profiles: !nobiarch
Description: GNU C Library: ARM hard float development libraries for armel
Contains the symlinks and object files needed to compile and link programs
which use the standard C library. This is the ARM hard float version of the
diff -Nru glibc-2.19/debian/control.in/i386 glibc-2.19/debian/control.in/i386
--- glibc-2.19/debian/control.in/i386 2014-06-27 04:28:51.0 +0200
+++ glibc-2.19/debian/control.in/i386 2014-07-19 07:54:14.0 +0200
@@ -5,7 +5,7 @@
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
Replaces: libc6-dev-i386
Breaks: fakeroot ( 1.12.3), gnu-efi ( 3.0e-3), fakechroot ( 2.9-1.1),
fglrx-glx-ia32 ( 1:9-6-1), ia32-libs ( 20090804), ia32-libs-gtk (
20090804), lib32asound2 ( 1.0.20-3), lib32asound2-dev ( 1.0.20-3),
lib32bz2-1.0 ( 1.0.5-3), lib32bz2-dev ( 1.0.5-3), lib32ffi-dev (
3.0.9~rc9-1), lib32ffi5 ( 3.0.9~rc9-1), lib32g2c0 ( 1:3.4.6-10), lib32gcc1
( 1:4.4.0-7), lib32gfortran3 ( 4.4.0-7), lib32gmp3 ( 2:4.3.1+dfsg-3),
lib32gmp3-dev ( 2:4.3.1+dfsg-3), lib32gmpxx4 ( 2:4.3.1+dfsg-3), lib32gomp1
( 4.4.0-7), lib32icu-dev ( 4.0.1-3), lib32icu40 ( 4.0.1-3), lib32mudflap0
( 4.4.0-7),