r6226 - in glibc-package/trunk/debian: . control.in sysdeps
Author: aurel32
Date: 2014-08-14 12:57:46 +0000 (Thu, 14 Aug 2014)
New Revision: 6226
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/control
glibc-package/trunk/debian/control.in/amd64
glibc-package/trunk/debian/control.in/armel
glibc-package/trunk/debian/control.in/armhf
glibc-package/trunk/debian/control.in/i386
glibc-package/trunk/debian/control.in/kfreebsd-i386
glibc-package/trunk/debian/control.in/libc
glibc-package/trunk/debian/control.in/mips32
glibc-package/trunk/debian/control.in/mips64
glibc-package/trunk/debian/control.in/mipsn32
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/sparc
glibc-package/trunk/debian/control.in/sparc64
glibc-package/trunk/debian/control.in/x32
glibc-package/trunk/debian/rules
glibc-package/trunk/debian/sysdeps/amd64.mk
glibc-package/trunk/debian/sysdeps/armel.mk
glibc-package/trunk/debian/sysdeps/armhf.mk
glibc-package/trunk/debian/sysdeps/i386.mk
glibc-package/trunk/debian/sysdeps/kfreebsd-amd64.mk
glibc-package/trunk/debian/sysdeps/mips.mk
glibc-package/trunk/debian/sysdeps/mips64.mk
glibc-package/trunk/debian/sysdeps/mips64el.mk
glibc-package/trunk/debian/sysdeps/mipsel.mk
glibc-package/trunk/debian/sysdeps/mipsn32.mk
glibc-package/trunk/debian/sysdeps/mipsn32el.mk
glibc-package/trunk/debian/sysdeps/powerpc.mk
glibc-package/trunk/debian/sysdeps/ppc64.mk
glibc-package/trunk/debian/sysdeps/s390x.mk
glibc-package/trunk/debian/sysdeps/sparc.mk
glibc-package/trunk/debian/sysdeps/sparc64.mk
glibc-package/trunk/debian/sysdeps/x32.mk
Log:
* Add a "nobiarch" build profile that inhibits all multilib packages from
being built. Closes: #745380.
* debian/control/libc: drop Recommends on: gcc | c-compiler. Closes:
#747933.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2014-08-14 12:12:13 UTC (rev 6225)
+++ glibc-package/trunk/debian/changelog 2014-08-14 12:57:46 UTC (rev 6226)
@@ -3,6 +3,8 @@
[ Helmut Grohne ]
* debian/patches/build stage2 without selinux. Closes: #742640.
* Don't emit dependencies on libgcc when building stage2. Closes: #755580.
+ * Add a "nobiarch" build profile that inhibits all multilib packages from
+ being built. Closes: #745380.
[ Aurelien Jarno ]
* debian/patches/arm64/cvs-includes-cleanup.diff: new patch from upstream to
@@ -13,6 +15,8 @@
* Remove ia64 support. Closes: #756095.
* Update debian/copyright with the libidn/punycode.{c,h} license. Closes:
#754731.
+ * debian/control/libc: drop Recommends on: gcc | c-compiler. Closes:
+ #747933.
-- Adam Conrad <adconrad@0c3.net> Sat, 12 Jul 2014 20:53:51 -0600
Modified: glibc-package/trunk/debian/control
===================================================================
--- glibc-package/trunk/debian/control 2014-08-14 12:12:13 UTC (rev 6225)
+++ glibc-package/trunk/debian/control 2014-08-14 12:57:46 UTC (rev 6226)
@@ -180,7 +180,6 @@
Multi-Arch: same
Depends: libc6 (= ${binary:Version}), libc-dev-bin (= ${binary:Version}), ${misc:Depends}, linux-libc-dev [linux-any], kfreebsd-kernel-headers (>= 0.11) [kfreebsd-any], gnumach-dev [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386]
Replaces: hurd-dev (<< 20120408-3) [hurd-i386]
-Recommends: gcc | c-compiler
Suggests: glibc-doc, manpages-dev
Provides: libc-dev, libc6-dev [alpha hurd-i386 kfreebsd-i386 kfreebsd-amd64]
Breaks: binutils (<< 2.20.1-1), binutils-gold (<< 2.20.1-11), cmake (<< 2.8.4+dfsg.1-5), gcc-4.4 (<< 4.4.6-4), gcc-4.5 (<< 4.5.3-2), gcc-4.6 (<< 4.6.0-12), make (<< 3.81-8.1), pkg-config (<< 0.26-1), libjna-java (<< 3.2.7-4), liblouis-dev (<< 2.3.0-2), liblouisxml-dev (<< 2.4.0-2), libhwloc-dev (<< 1.2-3), check (<< 0.9.10-6.1+b1) [s390x]
@@ -278,7 +277,6 @@
Multi-Arch: same
Depends: libc6.1 (= ${binary:Version}), libc-dev-bin (= ${binary:Version}), ${misc:Depends}, linux-libc-dev [linux-any], kfreebsd-kernel-headers (>= 0.11) [kfreebsd-any], gnumach-dev [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386]
Replaces: hurd-dev (<< 20120408-3) [hurd-i386]
-Recommends: gcc | c-compiler
Suggests: glibc-doc, manpages-dev
Provides: libc-dev, libc6-dev [alpha hurd-i386 kfreebsd-i386 kfreebsd-amd64]
Breaks: binutils (<< 2.20.1-1), binutils-gold (<< 2.20.1-11), cmake (<< 2.8.4+dfsg.1-5), gcc-4.4 (<< 4.4.6-4), gcc-4.5 (<< 4.5.3-2), gcc-4.6 (<< 4.6.0-12), make (<< 3.81-8.1), pkg-config (<< 0.26-1), libjna-java (<< 3.2.7-4), liblouis-dev (<< 2.3.0-2), liblouisxml-dev (<< 2.4.0-2), libhwloc-dev (<< 1.2-3), check (<< 0.9.10-6.1+b1) [s390x]
@@ -376,7 +374,6 @@
Multi-Arch: same
Depends: libc0.3 (= ${binary:Version}), libc-dev-bin (= ${binary:Version}), ${misc:Depends}, linux-libc-dev [linux-any], kfreebsd-kernel-headers (>= 0.11) [kfreebsd-any], gnumach-dev [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386]
Replaces: hurd-dev (<< 20120408-3) [hurd-i386]
-Recommends: gcc | c-compiler
Suggests: glibc-doc, manpages-dev
Provides: libc-dev, libc6-dev [alpha hurd-i386 kfreebsd-i386 kfreebsd-amd64]
Breaks: binutils (<< 2.20.1-1), binutils-gold (<< 2.20.1-11), cmake (<< 2.8.4+dfsg.1-5), gcc-4.4 (<< 4.4.6-4), gcc-4.5 (<< 4.5.3-2), gcc-4.6 (<< 4.6.0-12), make (<< 3.81-8.1), pkg-config (<< 0.26-1), libjna-java (<< 3.2.7-4), liblouis-dev (<< 2.3.0-2), liblouisxml-dev (<< 2.4.0-2), libhwloc-dev (<< 1.2-3), check (<< 0.9.10-6.1+b1) [s390x]
@@ -474,7 +471,6 @@
Multi-Arch: same
Depends: libc0.1 (= ${binary:Version}), libc-dev-bin (= ${binary:Version}), ${misc:Depends}, linux-libc-dev [linux-any], kfreebsd-kernel-headers (>= 0.11) [kfreebsd-any], gnumach-dev [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386]
Replaces: hurd-dev (<< 20120408-3) [hurd-i386]
-Recommends: gcc | c-compiler
Suggests: glibc-doc, manpages-dev
Provides: libc-dev, libc6-dev [alpha hurd-i386 kfreebsd-i386 kfreebsd-amd64]
Breaks: binutils (<< 2.20.1-1), binutils-gold (<< 2.20.1-11), cmake (<< 2.8.4+dfsg.1-5), gcc-4.4 (<< 4.4.6-4), gcc-4.5 (<< 4.5.3-2), gcc-4.6 (<< 4.6.0-12), make (<< 3.81-8.1), pkg-config (<< 0.26-1), libjna-java (<< 3.2.7-4), liblouis-dev (<< 2.3.0-2), liblouisxml-dev (<< 2.4.0-2), libhwloc-dev (<< 1.2-3), check (<< 0.9.10-6.1+b1) [s390x]
@@ -543,7 +539,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), lib32ncurses5 (<< 5.7+20090523-1), lib32ncurses5-dev (<< 5.7+20090530-1), lib32ncursesw5 (<< 5.7+20090530-1), lib32ncursesw5-dev (<< 5.7+20090530-1), lib32nss-mdns (<< 0.10-3.1), lib32objc2 (<< 4.4.0-7), lib32readline5 (<< 5.2-5), lib32readline5-dev (<< 5.2-5), lib32stdc++6 (<< 4.4.0-7), lib32stdc++6-4.4-dbg (<< 4.4.0-7), lib32z1 (<< 1:1.2.3.3.dfsg-14), lib32z1-dev (<< 1:1.2.3
.3.dfsg-14), libc6-dev-i386 (<< 2.9-15), nvidia-glx-ia32 (<< 185.18.14-2), nvidia-libvdpau1-ia32 (<< 185.18.14-2)
-Build-Profiles: !stage1
+Build-Profiles: !stage1 !nobiarch
Description: GNU C Library: 32-bit shared libraries for AMD64
This package includes shared versions of the standard C
library and the standard math library, as well as many others.
@@ -558,6 +554,7 @@
Replaces: libc6-dev (<< 2.13-11)
Depends: libc6-i386 (= ${binary:Version}), libc6-dev (= ${binary:Version}), ${misc:Depends}
Recommends: gcc-multilib
+Build-Profiles: !nobiarch
Description: GNU C Library: 32-bit 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 32bit version of the
@@ -568,7 +565,7 @@
Section: libs
Priority: optional
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
-Build-Profiles: !stage1
+Build-Profiles: !stage1 !nobiarch
Description: GNU C Library: 32bit Shared libraries for SPARC
This package includes shared versions of the standard C library and the
standard math library, as well as many others. This is the 32bit version
@@ -583,6 +580,7 @@
Replaces: libc6-dev (<< 2.13-11)
Depends: libc6-sparc (= ${binary:Version}), libc6-dev (= ${binary:Version}), ${misc:Depends}
Recommends: gcc-multilib
+Build-Profiles: !nobiarch
Description: GNU C Library: 32bit Development Libraries for SPARC
Contains the symlinks and object files needed to compile and link programs
which use the standard C library. This is the 32bit version of the
@@ -593,7 +591,7 @@
Section: libs
Priority: optional
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
-Build-Profiles: !stage1
+Build-Profiles: !stage1 !nobiarch
Description: GNU C Library: 64bit Shared libraries for UltraSPARC
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
@@ -608,6 +606,7 @@
Replaces: libc6-dev (<< 2.13-11)
Depends: libc6-sparc64 (= ${binary:Version}), libc6-dev (= ${binary:Version}), ${misc:Depends}
Recommends: gcc-multilib
+Build-Profiles: !nobiarch
Description: GNU C Library: 64bit Development Libraries for UltraSPARC
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
@@ -618,7 +617,7 @@
Section: libs
Priority: optional
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
-Build-Profiles: !stage1
+Build-Profiles: !stage1 !nobiarch
Description: GNU C Library: 32bit Shared libraries for IBM zSeries
This package includes shared versions of the standard C library and the
standard math library, as well as many others. This is the 32bit version
@@ -633,6 +632,7 @@
Replaces: libc6-dev (<< 2.13-11)
Depends: libc6-s390 (= ${binary:Version}), libc6-dev (= ${binary:Version}), ${misc:Depends}
Recommends: gcc-multilib
+Build-Profiles: !nobiarch
Description: GNU C Library: 32bit Development Libraries for IBM zSeries
Contains the symlinks and object files needed to compile and link programs
which use the standard C library. This is the 32bit version of the
@@ -644,7 +644,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
@@ -659,6 +659,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
@@ -669,7 +670,7 @@
Section: libs
Priority: optional
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
-Build-Profiles: !stage1
+Build-Profiles: !stage1 !nobiarch
Description: GNU C Library: 32bit powerpc shared libraries for ppc64
This package includes shared versions of the standard C
library and the standard math library, as well as many others.
@@ -684,6 +685,7 @@
Replaces: libc6-dev (<< 2.13-11)
Depends: libc6-powerpc (= ${binary:Version}), libc6-dev (= ${binary:Version}), ${misc:Depends}
Recommends: gcc-multilib
+Build-Profiles: !nobiarch
Description: GNU C Library: 32bit powerpc development libraries for ppc64
Contains the symlinks and object files needed to compile and link programs
which use the standard C library. This is the 32bit version of the
@@ -694,7 +696,7 @@
Section: libs
Priority: optional
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
-Build-Profiles: !stage1
+Build-Profiles: !stage1 !nobiarch
Description: GNU C Library: 64bit Shared libraries for PowerPC64
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
@@ -709,6 +711,7 @@
Replaces: libc6-dev (<< 2.13-11)
Depends: libc6-ppc64 (= ${binary:Version}), libc6-dev (= ${binary:Version}), ${misc:Depends}
Recommends: gcc-multilib
+Build-Profiles: !nobiarch
Description: GNU C Library: 64bit Development Libraries for PowerPC64
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
@@ -719,7 +722,7 @@
Section: libs
Priority: optional
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
-Build-Profiles: !stage1
+Build-Profiles: !stage1 !nobiarch
Description: GNU C Library: o32 Shared libraries for MIPS
This package includes shared versions of the standard C library and the
standard math library, as well as many others. This is the o32 version
@@ -737,6 +740,7 @@
libc6-dev-mips64 (= ${binary:Version}) [mipsn32 mipsn32el],
${misc:Depends}
Recommends: gcc-multilib
+Build-Profiles: !nobiarch
Description: GNU C Library: o32 Development Libraries for MIPS
Contains the symlinks and object files needed to compile and link programs
which use the standard C library. This is the o32 version of the
@@ -747,7 +751,7 @@
Section: libs
Priority: optional
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
-Build-Profiles: !stage1
+Build-Profiles: !stage1 !nobiarch
Description: GNU C Library: n32 Shared libraries for MIPS64
This package includes shared versions of the standard C library and the
standard math library, as well as many others. This is the n32 version
@@ -762,6 +766,7 @@
Replaces: libc6-dev (<< 2.13-11)
Depends: libc6-mipsn32 (= ${binary:Version}), libc6-dev-mips64 (= ${binary:Version}) [mips mipsel], libc6-dev (= ${binary:Version}), ${misc:Depends}
Recommends: gcc-multilib
+Build-Profiles: !nobiarch
Description: GNU C Library: n32 Development Libraries for MIPS64
Contains the symlinks and object files needed to compile and link programs
which use the standard C library. This is the n32 version of the
@@ -772,7 +777,7 @@
Section: libs
Priority: optional
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
-Build-Profiles: !stage1
+Build-Profiles: !stage1 !nobiarch
Description: GNU C Library: 64bit Shared libraries for MIPS64
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
@@ -787,6 +792,7 @@
Replaces: libc6-dev (<< 2.13-11)
Depends: libc6-mips64 (= ${binary:Version}), libc6-dev (= ${binary:Version}), ${misc:Depends}
Recommends: gcc-multilib
+Build-Profiles: !nobiarch
Description: GNU C Library: 64bit Development Libraries for MIPS64
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
@@ -797,7 +803,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.
@@ -809,6 +815,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
@@ -819,7 +826,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.
@@ -831,6 +838,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
@@ -841,7 +849,7 @@
Section: libs
Priority: optional
Depends: libc0.1 (= ${binary:Version}), ${misc:Depends}
-Build-Profiles: !stage1
+Build-Profiles: !stage1 !nobiarch
Description: GNU C Library: 32bit shared libraries for AMD64
This package includes shared versions of the standard C
library and the standard math library, as well as many others.
@@ -856,6 +864,7 @@
Replaces: libc0.1-dev (<< 2.13-11)
Depends: libc0.1-i386 (= ${binary:Version}), libc0.1-dev (= ${binary:Version}), ${misc:Depends}
Recommends: gcc-multilib
+Build-Profiles: !nobiarch
Description: GNU C Library: 32bit 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 32bit version of the
@@ -866,7 +875,7 @@
Section: libs
Priority: optional
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
-Build-Profiles: !stage1
+Build-Profiles: !stage1 !nobiarch
Description: GNU C Library: X32 ABI 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 X32 ABI version
@@ -877,6 +886,7 @@
Section: libdevel
Priority: optional
Depends: libc6-x32 (= ${binary:Version}), libc6-dev-i386 (= ${binary:Version}) [amd64], libc6-dev-amd64 (= ${binary:Version}) [i386], libc6-dev (= ${binary:Version}), ${misc:Depends}
+Build-Profiles: !nobiarch
Description: GNU C Library: X32 ABI 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 X32 ABI version of the
Modified: glibc-package/trunk/debian/control.in/amd64
===================================================================
--- glibc-package/trunk/debian/control.in/amd64 2014-08-14 12:12:13 UTC (rev 6225)
+++ glibc-package/trunk/debian/control.in/amd64 2014-08-14 12:57:46 UTC (rev 6226)
@@ -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
Modified: glibc-package/trunk/debian/control.in/armel
===================================================================
--- glibc-package/trunk/debian/control.in/armel 2014-08-14 12:12:13 UTC (rev 6225)
+++ glibc-package/trunk/debian/control.in/armel 2014-08-14 12:57:46 UTC (rev 6226)
@@ -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
Modified: glibc-package/trunk/debian/control.in/armhf
===================================================================
--- glibc-package/trunk/debian/control.in/armhf 2014-08-14 12:12:13 UTC (rev 6225)
+++ glibc-package/trunk/debian/control.in/armhf 2014-08-14 12:57:46 UTC (rev 6226)
@@ -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
Modified: glibc-package/trunk/debian/control.in/i386
===================================================================
--- glibc-package/trunk/debian/control.in/i386 2014-08-14 12:12:13 UTC (rev 6225)
+++ glibc-package/trunk/debian/control.in/i386 2014-08-14 12:57:46 UTC (rev 6226)
@@ -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), lib32ncurses5 (<< 5.7+20090523-1), lib32ncurses5-dev (<< 5.7+20090530-1), lib32ncursesw5 (<< 5.7+20090530-1), lib32ncursesw5-dev (<< 5.7+20090530-1), lib32nss-mdns (<< 0.10-3.1), lib32objc2 (<< 4.4.0-7), lib32readline5 (<< 5.2-5), lib32readline5-dev (<< 5.2-5), lib32stdc++6 (<< 4.4.0-7), lib32stdc++6-4.4-dbg (<< 4.4.0-7), lib32z1 (<< 1:1.2.3.3.dfsg-14), lib32z1-dev (<< 1:1.2.3
.3.dfsg-14), libc6-dev-i386 (<< 2.9-15), nvidia-glx-ia32 (<< 185.18.14-2), nvidia-libvdpau1-ia32 (<< 185.18.14-2)
-Build-Profiles: !stage1
+Build-Profiles: !stage1 !nobiarch
Description: GNU C Library: 32-bit shared libraries for AMD64
This package includes shared versions of the standard C
library and the standard math library, as well as many others.
@@ -20,6 +20,7 @@
Replaces: libc6-dev (<< 2.13-11)
Depends: libc6-i386 (= ${binary:Version}), libc6-dev (= ${binary:Version}), ${misc:Depends}
Recommends: gcc-multilib
+Build-Profiles: !nobiarch
Description: GNU C Library: 32-bit 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 32bit version of the
Modified: glibc-package/trunk/debian/control.in/kfreebsd-i386
===================================================================
--- glibc-package/trunk/debian/control.in/kfreebsd-i386 2014-08-14 12:12:13 UTC (rev 6225)
+++ glibc-package/trunk/debian/control.in/kfreebsd-i386 2014-08-14 12:57:46 UTC (rev 6226)
@@ -3,7 +3,7 @@
Section: libs
Priority: optional
Depends: libc0.1 (= ${binary:Version}), ${misc:Depends}
-Build-Profiles: !stage1
+Build-Profiles: !stage1 !nobiarch
Description: GNU C Library: 32bit shared libraries for AMD64
This package includes shared versions of the standard C
library and the standard math library, as well as many others.
@@ -18,6 +18,7 @@
Replaces: libc0.1-dev (<< 2.13-11)
Depends: libc0.1-i386 (= ${binary:Version}), libc0.1-dev (= ${binary:Version}), ${misc:Depends}
Recommends: gcc-multilib
+Build-Profiles: !nobiarch
Description: GNU C Library: 32bit 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 32bit version of the
Modified: glibc-package/trunk/debian/control.in/libc
===================================================================
--- glibc-package/trunk/debian/control.in/libc 2014-08-14 12:12:13 UTC (rev 6225)
+++ glibc-package/trunk/debian/control.in/libc 2014-08-14 12:57:46 UTC (rev 6226)
@@ -34,7 +34,6 @@
Multi-Arch: same
Depends: @libc@ (= ${binary:Version}), libc-dev-bin (= ${binary:Version}), ${misc:Depends}, linux-libc-dev [linux-any], kfreebsd-kernel-headers (>= 0.11) [kfreebsd-any], gnumach-dev [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386]
Replaces: hurd-dev (<< 20120408-3) [hurd-i386]
-Recommends: gcc | c-compiler
Suggests: glibc-doc, manpages-dev
Provides: libc-dev, libc6-dev [alpha hurd-i386 kfreebsd-i386 kfreebsd-amd64]
Breaks: binutils (<< 2.20.1-1), binutils-gold (<< 2.20.1-11), cmake (<< 2.8.4+dfsg.1-5), gcc-4.4 (<< 4.4.6-4), gcc-4.5 (<< 4.5.3-2), gcc-4.6 (<< 4.6.0-12), make (<< 3.81-8.1), pkg-config (<< 0.26-1), libjna-java (<< 3.2.7-4), liblouis-dev (<< 2.3.0-2), liblouisxml-dev (<< 2.4.0-2), libhwloc-dev (<< 1.2-3), check (<< 0.9.10-6.1+b1) [s390x]
Modified: glibc-package/trunk/debian/control.in/mips32
===================================================================
--- glibc-package/trunk/debian/control.in/mips32 2014-08-14 12:12:13 UTC (rev 6225)
+++ glibc-package/trunk/debian/control.in/mips32 2014-08-14 12:57:46 UTC (rev 6226)
@@ -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: o32 Shared libraries for MIPS
This package includes shared versions of the standard C library and the
standard math library, as well as many others. This is the o32 version
@@ -21,6 +21,7 @@
libc6-dev-mips64 (= ${binary:Version}) [mipsn32 mipsn32el],
${misc:Depends}
Recommends: gcc-multilib
+Build-Profiles: !nobiarch
Description: GNU C Library: o32 Development Libraries for MIPS
Contains the symlinks and object files needed to compile and link programs
which use the standard C library. This is the o32 version of the
Modified: glibc-package/trunk/debian/control.in/mips64
===================================================================
--- glibc-package/trunk/debian/control.in/mips64 2014-08-14 12:12:13 UTC (rev 6225)
+++ glibc-package/trunk/debian/control.in/mips64 2014-08-14 12:57:46 UTC (rev 6226)
@@ -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: 64bit Shared libraries for MIPS64
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
@@ -18,6 +18,7 @@
Replaces: libc6-dev (<< 2.13-11)
Depends: libc6-mips64 (= ${binary:Version}), libc6-dev (= ${binary:Version}), ${misc:Depends}
Recommends: gcc-multilib
+Build-Profiles: !nobiarch
Description: GNU C Library: 64bit Development Libraries for MIPS64
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
Modified: glibc-package/trunk/debian/control.in/mipsn32
===================================================================
--- glibc-package/trunk/debian/control.in/mipsn32 2014-08-14 12:12:13 UTC (rev 6225)
+++ glibc-package/trunk/debian/control.in/mipsn32 2014-08-14 12:57:46 UTC (rev 6226)
@@ -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: n32 Shared libraries for MIPS64
This package includes shared versions of the standard C library and the
standard math library, as well as many others. This is the n32 version
@@ -18,6 +18,7 @@
Replaces: libc6-dev (<< 2.13-11)
Depends: libc6-mipsn32 (= ${binary:Version}), libc6-dev-mips64 (= ${binary:Version}) [mips mipsel], libc6-dev (= ${binary:Version}), ${misc:Depends}
Recommends: gcc-multilib
+Build-Profiles: !nobiarch
Description: GNU C Library: n32 Development Libraries for MIPS64
Contains the symlinks and object files needed to compile and link programs
which use the standard C library. This is the n32 version of the
Modified: glibc-package/trunk/debian/control.in/powerpc
===================================================================
--- glibc-package/trunk/debian/control.in/powerpc 2014-08-14 12:12:13 UTC (rev 6225)
+++ glibc-package/trunk/debian/control.in/powerpc 2014-08-14 12:57:46 UTC (rev 6226)
@@ -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: 32bit powerpc shared libraries for ppc64
This package includes shared versions of the standard C
library and the standard math library, as well as many others.
@@ -18,6 +18,7 @@
Replaces: libc6-dev (<< 2.13-11)
Depends: libc6-powerpc (= ${binary:Version}), libc6-dev (= ${binary:Version}), ${misc:Depends}
Recommends: gcc-multilib
+Build-Profiles: !nobiarch
Description: GNU C Library: 32bit powerpc development libraries for ppc64
Contains the symlinks and object files needed to compile and link programs
which use the standard C library. This is the 32bit version of the
Modified: glibc-package/trunk/debian/control.in/ppc64
===================================================================
--- glibc-package/trunk/debian/control.in/ppc64 2014-08-14 12:12:13 UTC (rev 6225)
+++ glibc-package/trunk/debian/control.in/ppc64 2014-08-14 12:57:46 UTC (rev 6226)
@@ -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: 64bit Shared libraries for PowerPC64
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
@@ -18,6 +18,7 @@
Replaces: libc6-dev (<< 2.13-11)
Depends: libc6-ppc64 (= ${binary:Version}), libc6-dev (= ${binary:Version}), ${misc:Depends}
Recommends: gcc-multilib
+Build-Profiles: !nobiarch
Description: GNU C Library: 64bit Development Libraries for PowerPC64
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
Modified: glibc-package/trunk/debian/control.in/s390
===================================================================
--- glibc-package/trunk/debian/control.in/s390 2014-08-14 12:12:13 UTC (rev 6225)
+++ glibc-package/trunk/debian/control.in/s390 2014-08-14 12:57:46 UTC (rev 6226)
@@ -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: 32bit Shared libraries for IBM zSeries
This package includes shared versions of the standard C library and the
standard math library, as well as many others. This is the 32bit version
@@ -18,6 +18,7 @@
Replaces: libc6-dev (<< 2.13-11)
Depends: libc6-s390 (= ${binary:Version}), libc6-dev (= ${binary:Version}), ${misc:Depends}
Recommends: gcc-multilib
+Build-Profiles: !nobiarch
Description: GNU C Library: 32bit Development Libraries for IBM zSeries
Contains the symlinks and object files needed to compile and link programs
which use the standard C library. This is the 32bit version of the
Modified: glibc-package/trunk/debian/control.in/sparc
===================================================================
--- glibc-package/trunk/debian/control.in/sparc 2014-08-14 12:12:13 UTC (rev 6225)
+++ glibc-package/trunk/debian/control.in/sparc 2014-08-14 12:57:46 UTC (rev 6226)
@@ -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: 32bit Shared libraries for SPARC
This package includes shared versions of the standard C library and the
standard math library, as well as many others. This is the 32bit version
@@ -18,6 +18,7 @@
Replaces: libc6-dev (<< 2.13-11)
Depends: libc6-sparc (= ${binary:Version}), libc6-dev (= ${binary:Version}), ${misc:Depends}
Recommends: gcc-multilib
+Build-Profiles: !nobiarch
Description: GNU C Library: 32bit Development Libraries for SPARC
Contains the symlinks and object files needed to compile and link programs
which use the standard C library. This is the 32bit version of the
Modified: glibc-package/trunk/debian/control.in/sparc64
===================================================================
--- glibc-package/trunk/debian/control.in/sparc64 2014-08-14 12:12:13 UTC (rev 6225)
+++ glibc-package/trunk/debian/control.in/sparc64 2014-08-14 12:57:46 UTC (rev 6226)
@@ -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: 64bit Shared libraries for UltraSPARC
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
@@ -18,6 +18,7 @@
Replaces: libc6-dev (<< 2.13-11)
Depends: libc6-sparc64 (= ${binary:Version}), libc6-dev (= ${binary:Version}), ${misc:Depends}
Recommends: gcc-multilib
+Build-Profiles: !nobiarch
Description: GNU C Library: 64bit Development Libraries for UltraSPARC
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
Modified: glibc-package/trunk/debian/control.in/x32
===================================================================
--- glibc-package/trunk/debian/control.in/x32 2014-08-14 12:12:13 UTC (rev 6225)
+++ glibc-package/trunk/debian/control.in/x32 2014-08-14 12:57:46 UTC (rev 6226)
@@ -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: X32 ABI 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 X32 ABI version
@@ -14,6 +14,7 @@
Section: libdevel
Priority: optional
Depends: libc6-x32 (= ${binary:Version}), libc6-dev-i386 (= ${binary:Version}) [amd64], libc6-dev-amd64 (= ${binary:Version}) [i386], libc6-dev (= ${binary:Version}), ${misc:Depends}
+Build-Profiles: !nobiarch
Description: GNU C Library: X32 ABI 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 X32 ABI version of the
Modified: glibc-package/trunk/debian/rules
===================================================================
--- glibc-package/trunk/debian/rules 2014-08-14 12:12:13 UTC (rev 6225)
+++ glibc-package/trunk/debian/rules 2014-08-14 12:57:46 UTC (rev 6226)
@@ -178,6 +178,11 @@
-include debian/sysdeps/$(DEB_HOST_ARCH_OS).mk
-include debian/sysdeps/$(DEB_HOST_ARCH).mk
+ifeq ($(filter nobiarch,$(DEB_BUILD_PROFILES)),)
+GLIBC_PASSES += $(GLIBC_MULTILIB_PASSES)
+DEB_ARCH_REGULAR_PACKAGES += $(DEB_ARCH_MULTILIB_PACKAGES)
+endif
+
# Don't run dh_strip on this package
NOSTRIP_$(libc)-dbg = 1
Modified: glibc-package/trunk/debian/sysdeps/amd64.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/amd64.mk 2014-08-14 12:12:13 UTC (rev 6225)
+++ glibc-package/trunk/debian/sysdeps/amd64.mk 2014-08-14 12:57:46 UTC (rev 6226)
@@ -2,8 +2,8 @@
extra_config_options = --enable-multi-arch --enable-lock-elision
# build 32-bit (i386) alternative library
-GLIBC_PASSES += i386
-DEB_ARCH_REGULAR_PACKAGES += libc6-i386 libc6-dev-i386
+GLIBC_MULTILIB_PASSES += i386
+DEB_ARCH_MULTILIB_PACKAGES += libc6-i386 libc6-dev-i386
libc6-i386_shlib_dep = libc6-i386 (>= $(shlib_dep_ver))
i386_add-ons = nptl $(add-ons)
i386_configure_target = i686-linux-gnu
@@ -38,8 +38,8 @@
endef
# build x32 ABI alternative library
-GLIBC_PASSES += x32
-DEB_ARCH_REGULAR_PACKAGES += libc6-x32 libc6-dev-x32
+GLIBC_MULTILIB_PASSES += x32
+DEB_ARCH_MULTILIB_PACKAGES += libc6-x32 libc6-dev-x32
libc6-x32_shlib_dep = libc6-x32 (>= $(shlib_dep_ver))
x32_add-ons = nptl $(add-ons)
x32_configure_target = x86_64-linux-gnux32
Modified: glibc-package/trunk/debian/sysdeps/armel.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/armel.mk 2014-08-14 12:12:13 UTC (rev 6225)
+++ glibc-package/trunk/debian/sysdeps/armel.mk 2014-08-14 12:57:46 UTC (rev 6226)
@@ -1,8 +1,8 @@
libc_add-ons = ports nptl $(add-ons)
extra_config_options = --enable-multi-arch
-#GLIBC_PASSES += armhf
-#DEB_ARCH_REGULAR_PACKAGES += libc6-armhf libc6-dev-armhf
+#GLIBC_MULTILIB_PASSES += armhf
+#DEB_ARCH_MULTILIB_PACKAGES += libc6-armhf libc6-dev-armhf
#armhf_add-ons = ports nptl $(add-ons)
#armhf_configure_target = arm-linux-gnueabihf
#armhf_CC = $(CC) -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard
Modified: glibc-package/trunk/debian/sysdeps/armhf.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/armhf.mk 2014-08-14 12:12:13 UTC (rev 6225)
+++ glibc-package/trunk/debian/sysdeps/armhf.mk 2014-08-14 12:57:46 UTC (rev 6226)
@@ -12,8 +12,8 @@
ln -sf /lib/ld-linux-armhf.so.3 debian/libc6-udeb/lib/arm-linux-gnueabihf/ld-linux.so.3
endef
-#GLIBC_PASSES += armel
-#DEB_ARCH_REGULAR_PACKAGES += libc6-armel libc6-dev-armel
+#GLIBC_MULTILIB_PASSES += armel
+#DEB_ARCH_MULTILIB_PACKAGES += libc6-armel libc6-dev-armel
#armel_add-ons = ports nptl $(add-ons)
#armel_configure_target = arm-linux-gnueabi
#armel_CC = $(CC) -mfloat-abi=soft
Modified: glibc-package/trunk/debian/sysdeps/i386.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/i386.mk 2014-08-14 12:12:13 UTC (rev 6225)
+++ glibc-package/trunk/debian/sysdeps/i386.mk 2014-08-14 12:57:46 UTC (rev 6226)
@@ -32,8 +32,8 @@
endef
# build 64-bit (amd64) alternative library
-GLIBC_PASSES += amd64
-DEB_ARCH_REGULAR_PACKAGES += libc6-amd64 libc6-dev-amd64
+GLIBC_MULTILIB_PASSES += amd64
+DEB_ARCH_MULTILIB_PACKAGES += libc6-amd64 libc6-dev-amd64
libc6-amd64_shlib_dep = libc6-amd64 (>= $(shlib_dep_ver))
amd64_add-ons = nptl $(add-ons)
amd64_configure_target = x86_64-linux-gnu
@@ -78,8 +78,8 @@
endef
# build x32 ABI alternative library
-GLIBC_PASSES += x32
-DEB_ARCH_REGULAR_PACKAGES += libc6-x32 libc6-dev-x32
+GLIBC_MULTILIB_PASSES += x32
+DEB_ARCH_MULTILIB_PACKAGES += libc6-x32 libc6-dev-x32
libc6-x32_shlib_dep = libc6-x32 (>= $(shlib_dep_ver))
x32_add-ons = nptl $(add-ons)
x32_configure_target = x86_64-linux-gnux32
Modified: glibc-package/trunk/debian/sysdeps/kfreebsd-amd64.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/kfreebsd-amd64.mk 2014-08-14 12:12:13 UTC (rev 6225)
+++ glibc-package/trunk/debian/sysdeps/kfreebsd-amd64.mk 2014-08-14 12:57:46 UTC (rev 6226)
@@ -2,8 +2,8 @@
extra_config_options = --disable-compatible-utmp --disable-multi-arch
# build 32-bit (i386) alternative library
-GLIBC_PASSES += i386
-DEB_ARCH_REGULAR_PACKAGES += libc0.1-i386 libc0.1-dev-i386
+GLIBC_MULTILIB_PASSES += i386
+DEB_ARCH_MULTILIB_PACKAGES += libc0.1-i386 libc0.1-dev-i386
libc0.1-i386_shlib_dep = libc0.1-i386 (>= $(shlib_dep_ver))
i386_configure_target = i686-kfreebsd-gnu
Modified: glibc-package/trunk/debian/sysdeps/mips.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/mips.mk 2014-08-14 12:12:13 UTC (rev 6225)
+++ glibc-package/trunk/debian/sysdeps/mips.mk 2014-08-14 12:57:46 UTC (rev 6226)
@@ -2,8 +2,8 @@
extra_cflags = -mno-plt
# build 32-bit (n32) alternative library
-GLIBC_PASSES += mipsn32
-DEB_ARCH_REGULAR_PACKAGES += libc6-mipsn32 libc6-dev-mipsn32
+GLIBC_MULTILIB_PASSES += mipsn32
+DEB_ARCH_MULTILIB_PACKAGES += libc6-mipsn32 libc6-dev-mipsn32
mipsn32_add-ons = ports nptl $(add-ons)
mipsn32_configure_target = mips64-linux-gnuabin32
mipsn32_extra_cflags = -mno-plt
@@ -16,8 +16,8 @@
mipsn32_extra_config_options := $(extra_config_options) --disable-profile
# build 64-bit alternative library
-GLIBC_PASSES += mips64
-DEB_ARCH_REGULAR_PACKAGES += libc6-mips64 libc6-dev-mips64
+GLIBC_MULTILIB_PASSES += mips64
+DEB_ARCH_MULTILIB_PACKAGES += libc6-mips64 libc6-dev-mips64
mips64_add-ons = ports nptl $(add-ons)
mips64_configure_target = mips64-linux-gnuabi64
mips64_extra_cflags = -mno-plt
Modified: glibc-package/trunk/debian/sysdeps/mips64.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/mips64.mk 2014-08-14 12:12:13 UTC (rev 6225)
+++ glibc-package/trunk/debian/sysdeps/mips64.mk 2014-08-14 12:57:46 UTC (rev 6226)
@@ -3,8 +3,8 @@
extra_cflags = -mno-plt
# build 32-bit (n32) alternative library
-GLIBC_PASSES += mipsn32
-DEB_ARCH_REGULAR_PACKAGES += libc6-mipsn32 libc6-dev-mipsn32
+GLIBC_MULTILIB_PASSES += mipsn32
+DEB_ARCH_MULTILIB_PACKAGES += libc6-mipsn32 libc6-dev-mipsn32
mipsn32_add-ons = ports nptl $(add-ons)
mipsn32_configure_target = mips64-linux-gnuabin32
mipsn32_extra_cflags = -mno-plt
@@ -17,8 +17,8 @@
mipsn32_extra_config_options := $(extra_config_options) --disable-profile
# build 32-bit (o32) alternative library
-GLIBC_PASSES += mips32
-DEB_ARCH_REGULAR_PACKAGES += libc6-mips32 libc6-dev-mips32
+GLIBC_MULTILIB_PASSES += mips32
+DEB_ARCH_MULTILIB_PACKAGES += libc6-mips32 libc6-dev-mips32
mips32_add-ons = ports nptl $(add-ons)
mips32_configure_target = mips-linux-gnu
mips32_extra_cflags = -mno-plt
Modified: glibc-package/trunk/debian/sysdeps/mips64el.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/mips64el.mk 2014-08-14 12:12:13 UTC (rev 6225)
+++ glibc-package/trunk/debian/sysdeps/mips64el.mk 2014-08-14 12:57:46 UTC (rev 6226)
@@ -3,8 +3,8 @@
extra_cflags = -mno-plt
# build 32-bit (n32) alternative library
-GLIBC_PASSES += mipsn32
-DEB_ARCH_REGULAR_PACKAGES += libc6-mipsn32 libc6-dev-mipsn32
+GLIBC_MULTILIB_PASSES += mipsn32
+DEB_ARCH_MULTILIB_PACKAGES += libc6-mipsn32 libc6-dev-mipsn32
mipsn32_add-ons = ports nptl $(add-ons)
mipsn32_configure_target = mips64el-linux-gnuabin32
mipsn32_extra_cflags = -mno-plt
@@ -17,8 +17,8 @@
mipsn32_extra_config_options := $(extra_config_options) --disable-profile
# build 32-bit (o32) alternative library
-GLIBC_PASSES += mips32
-DEB_ARCH_REGULAR_PACKAGES += libc6-mips32 libc6-dev-mips32
+GLIBC_MULTILIB_PASSES += mips32
+DEB_ARCH_MULTILIB_PACKAGES += libc6-mips32 libc6-dev-mips32
mips32_add-ons = ports nptl $(add-ons)
mips32_configure_target = mipsel-linux-gnu
mips32_extra_cflags = -mno-plt
Modified: glibc-package/trunk/debian/sysdeps/mipsel.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/mipsel.mk 2014-08-14 12:12:13 UTC (rev 6225)
+++ glibc-package/trunk/debian/sysdeps/mipsel.mk 2014-08-14 12:57:46 UTC (rev 6226)
@@ -2,8 +2,8 @@
extra_cflags = -mno-plt
# build 32-bit (n32) alternative library
-GLIBC_PASSES += mipsn32
-DEB_ARCH_REGULAR_PACKAGES += libc6-mipsn32 libc6-dev-mipsn32
+GLIBC_MULTILIB_PASSES += mipsn32
+DEB_ARCH_MULTILIB_PACKAGES += libc6-mipsn32 libc6-dev-mipsn32
mipsn32_add-ons = ports nptl $(add-ons)
mipsn32_configure_target = mips64el-linux-gnuabin32
mipsn32_extra_cflags = -mno-plt
@@ -16,8 +16,8 @@
mipsn32_extra_config_options := $(extra_config_options) --disable-profile
# build 64-bit alternative library
-GLIBC_PASSES += mips64
-DEB_ARCH_REGULAR_PACKAGES += libc6-mips64 libc6-dev-mips64
+GLIBC_MULTILIB_PASSES += mips64
+DEB_ARCH_MULTILIB_PACKAGES += libc6-mips64 libc6-dev-mips64
mips64_add-ons = ports nptl $(add-ons)
mips64_configure_target = mips64el-linux-gnuabi64
mips64_extra_cflags = -mno-plt
Modified: glibc-package/trunk/debian/sysdeps/mipsn32.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/mipsn32.mk 2014-08-14 12:12:13 UTC (rev 6225)
+++ glibc-package/trunk/debian/sysdeps/mipsn32.mk 2014-08-14 12:57:46 UTC (rev 6226)
@@ -3,8 +3,8 @@
extra_cflags = -mno-plt
# build 64-bit alternative library
-GLIBC_PASSES += mips64
-DEB_ARCH_REGULAR_PACKAGES += libc6-mips64 libc6-dev-mips64
+GLIBC_MULTILIB_PASSES += mips64
+DEB_ARCH_MULTILIB_PACKAGES += libc6-mips64 libc6-dev-mips64
mips64_add-ons = ports nptl $(add-ons)
mips64_configure_target = mips64-linux-gnuabi64
mips64_extra_cflags = -mno-plt
@@ -17,8 +17,8 @@
mips64_extra_config_options := $(extra_config_options) --disable-profile
# build 32-bit (o32) alternative library
-GLIBC_PASSES += mips32
-DEB_ARCH_REGULAR_PACKAGES += libc6-mips32 libc6-dev-mips32
+GLIBC_MULTILIB_PASSES += mips32
+DEB_ARCH_MULTILIB_PACKAGES += libc6-mips32 libc6-dev-mips32
mips32_add-ons = ports nptl $(add-ons)
mips32_configure_target = mips-linux-gnu
mips32_extra_cflags = -mno-plt
Modified: glibc-package/trunk/debian/sysdeps/mipsn32el.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/mipsn32el.mk 2014-08-14 12:12:13 UTC (rev 6225)
+++ glibc-package/trunk/debian/sysdeps/mipsn32el.mk 2014-08-14 12:57:46 UTC (rev 6226)
@@ -3,8 +3,8 @@
extra_cflags = -mno-plt
# build 64-bit alternative library
-GLIBC_PASSES += mips64
-DEB_ARCH_REGULAR_PACKAGES += libc6-mips64 libc6-dev-mips64
+GLIBC_MULTILIB_PASSES += mips64
+DEB_ARCH_MULTILIB_PACKAGES += libc6-mips64 libc6-dev-mips64
mips64_add-ons = ports nptl $(add-ons)
mips64_configure_target = mips64el-linux-gnuabi64
mips64_extra_cflags = -mno-plt
@@ -17,8 +17,8 @@
mips64_extra_config_options := $(extra_config_options) --disable-profile
# build 32-bit (o32) alternative library
-GLIBC_PASSES += mips32
-DEB_ARCH_REGULAR_PACKAGES += libc6-mips32 libc6-dev-mips32
+GLIBC_MULTILIB_PASSES += mips32
+DEB_ARCH_MULTILIB_PACKAGES += libc6-mips32 libc6-dev-mips32
mips32_add-ons = ports nptl $(add-ons)
mips32_configure_target = mipsel-linux-gnu
mips32_extra_cflags = -mno-plt
Modified: glibc-package/trunk/debian/sysdeps/powerpc.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/powerpc.mk 2014-08-14 12:12:13 UTC (rev 6225)
+++ glibc-package/trunk/debian/sysdeps/powerpc.mk 2014-08-14 12:57:46 UTC (rev 6226)
@@ -1,8 +1,8 @@
extra_config_options = --enable-multi-arch
# build 64-bit (ppc64) alternative library
-GLIBC_PASSES += ppc64
-DEB_ARCH_REGULAR_PACKAGES += libc6-ppc64 libc6-dev-ppc64
+GLIBC_MULTILIB_PASSES += ppc64
+DEB_ARCH_MULTILIB_PACKAGES += libc6-ppc64 libc6-dev-ppc64
ppc64_add-ons = nptl $(add-ons)
ppc64_configure_target = powerpc64-linux-gnu
ppc64_CC = $(CC) -m64
Modified: glibc-package/trunk/debian/sysdeps/ppc64.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/ppc64.mk 2014-08-14 12:12:13 UTC (rev 6225)
+++ glibc-package/trunk/debian/sysdeps/ppc64.mk 2014-08-14 12:57:46 UTC (rev 6226)
@@ -2,8 +2,8 @@
extra_config_options = --enable-multi-arch
# build 32-bit (powerpc) alternative library
-GLIBC_PASSES += powerpc
-DEB_ARCH_REGULAR_PACKAGES += libc6-powerpc libc6-dev-powerpc
+GLIBC_MULTILIB_PASSES += powerpc
+DEB_ARCH_MULTILIB_PACKAGES += libc6-powerpc libc6-dev-powerpc
libc6-powerpc_shlib_dep = libc6-powerpc (>= $(shlib_dep_ver))
powerpc_add-ons = nptl $(add-ons)
powerpc_configure_target = powerpc-linux-gnu
Modified: glibc-package/trunk/debian/sysdeps/s390x.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/s390x.mk 2014-08-14 12:12:13 UTC (rev 6225)
+++ glibc-package/trunk/debian/sysdeps/s390x.mk 2014-08-14 12:57:46 UTC (rev 6226)
@@ -2,8 +2,8 @@
extra_config_options = --enable-multi-arch
# build 32-bit (s390) alternative library
-GLIBC_PASSES += s390
-DEB_ARCH_REGULAR_PACKAGES += libc6-s390 libc6-dev-s390
+GLIBC_MULTILIB_PASSES += s390
+DEB_ARCH_MULTILIB_PACKAGES += libc6-s390 libc6-dev-s390
s390_add-ons = nptl $(add-ons)
s390_configure_target = s390-linux-gnu
s390_CC = $(CC) -m31
Modified: glibc-package/trunk/debian/sysdeps/sparc.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/sparc.mk 2014-08-14 12:12:13 UTC (rev 6225)
+++ glibc-package/trunk/debian/sysdeps/sparc.mk 2014-08-14 12:57:46 UTC (rev 6226)
@@ -1,8 +1,8 @@
extra_config_options = --disable-multi-arch
# build 64-bit (sparc64) alternative library
-GLIBC_PASSES += sparc64
-DEB_ARCH_REGULAR_PACKAGES += libc6-sparc64 libc6-dev-sparc64
+GLIBC_MULTILIB_PASSES += sparc64
+DEB_ARCH_MULTILIB_PACKAGES += libc6-sparc64 libc6-dev-sparc64
sparc64_add-ons = nptl $(add-ons)
sparc64_configure_target=sparc64-linux-gnu
sparc64_CC = $(CC) -m64
Modified: glibc-package/trunk/debian/sysdeps/sparc64.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/sparc64.mk 2014-08-14 12:12:13 UTC (rev 6225)
+++ glibc-package/trunk/debian/sysdeps/sparc64.mk 2014-08-14 12:57:46 UTC (rev 6226)
@@ -3,8 +3,8 @@
libc_extra_cflags = -mcpu=ultrasparc
# build 32-bit (sparc) alternative library
-GLIBC_PASSES += sparc
-DEB_ARCH_REGULAR_PACKAGES += libc6-sparc libc6-dev-sparc
+GLIBC_MULTILIB_PASSES += sparc
+DEB_ARCH_MULTILIB_PACKAGES += libc6-sparc libc6-dev-sparc
sparc_add-ons = nptl $(add-ons)
sparc_configure_target=sparc-linux-gnu
sparc_CC = $(CC) -m32
Modified: glibc-package/trunk/debian/sysdeps/x32.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/x32.mk 2014-08-14 12:12:13 UTC (rev 6225)
+++ glibc-package/trunk/debian/sysdeps/x32.mk 2014-08-14 12:57:46 UTC (rev 6226)
@@ -2,8 +2,8 @@
extra_config_options = --enable-multi-arch --enable-lock-elision
# build 64-bit (amd64) alternative library
-GLIBC_PASSES += amd64
-DEB_ARCH_REGULAR_PACKAGES += libc6-amd64 libc6-dev-amd64
+GLIBC_MULTILIB_PASSES += amd64
+DEB_ARCH_MULTILIB_PACKAGES += libc6-amd64 libc6-dev-amd64
libc6-amd64_shlib_dep = libc6-amd64 (>= $(shlib_dep_ver))
amd64_add-ons = nptl $(add-ons)
amd64_configure_target = x86_64-linux-gnu
@@ -33,8 +33,8 @@
endef
# build 32-bit (i386) alternative library
-GLIBC_PASSES += i386
-DEB_ARCH_REGULAR_PACKAGES += libc6-i386 libc6-dev-i386
+GLIBC_MULTILIB_PASSES += i386
+DEB_ARCH_MULTILIB_PACKAGES += libc6-i386 libc6-dev-i386
libc6-i386_shlib_dep = libc6-i386 (>= $(shlib_dep_ver))
i386_add-ons = nptl $(add-ons)
i386_configure_target = i686-linux-gnu
Reply to: