Package: src:glibc
Version: 2.24-12
Tags: patch
Please add conflicts for the multilib development packages. There are bug
reports with foreign architectures that try to install both libc6-dev-i386 and
libc6-dev-amd64 packages, and then failing because of conflicts in /usr/include.
This patch adds the conflicts for all the known multilib pairs/triples.
* Add conflicts for multilib development packages.
diff -Nru glibc-2.24/debian/control.in/amd64 glibc-2.24/debian/control.in/amd64
--- glibc-2.24/debian/control.in/amd64 2017-06-18 16:13:52.000000000 +0200
+++ glibc-2.24/debian/control.in/amd64 2017-07-31 13:03:42.000000000 +0200
@@ -16,6 +16,15 @@
Depends: libc6-amd64 (= ${binary:Version}), libc6-dev (= ${binary:Version}), ${misc:Depends}
Recommends: gcc-multilib
Provides: lib64c-dev
+Conflicts: libc6-dev-i386,
+ libc6-dev-mips32,
+ libc6-dev-mips64,
+ libc6-dev-mipsn32,
+ libc6-dev-powerpc,
+ libc6-dev-ppc64,
+ libc6-dev-sparc,
+ libc6-dev-sparc64,
+ libc6-dev-x32
Build-Profiles: <!nobiarch>
Description: GNU C Library: 64bit Development Libraries for AMD64
Contains the symlinks and object files needed to compile and link programs
diff -Nru glibc-2.24/debian/control.in/i386 glibc-2.24/debian/control.in/i386
--- glibc-2.24/debian/control.in/i386 2017-06-18 16:13:52.000000000 +0200
+++ glibc-2.24/debian/control.in/i386 2017-07-31 13:03:42.000000000 +0200
@@ -17,6 +17,15 @@
Provides: lib32c-dev
Depends: libc6-i386 (= ${binary:Version}), libc6-dev (= ${binary:Version}), ${misc:Depends}
Recommends: gcc-multilib
+Conflicts: libc6-dev-amd64,
+ libc6-dev-mips32,
+ libc6-dev-mips64,
+ libc6-dev-mipsn32,
+ libc6-dev-powerpc,
+ libc6-dev-ppc64,
+ libc6-dev-sparc,
+ libc6-dev-sparc64,
+ libc6-dev-x32
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
diff -Nru glibc-2.24/debian/control.in/mips32 glibc-2.24/debian/control.in/mips32
--- glibc-2.24/debian/control.in/mips32 2017-06-18 16:13:52.000000000 +0200
+++ glibc-2.24/debian/control.in/mips32 2017-07-31 13:03:42.000000000 +0200
@@ -19,6 +19,15 @@
libc6-dev-mips64 (= ${binary:Version}) [mipsn32 mipsn32el],
${misc:Depends}
Recommends: gcc-multilib
+Conflicts: libc6-dev-amd64,
+ libc6-dev-i386,
+ libc6-dev-mips64,
+ libc6-dev-mipsn32,
+ libc6-dev-powerpc,
+ libc6-dev-ppc64,
+ libc6-dev-sparc,
+ libc6-dev-sparc64,
+ libc6-dev-x32
Build-Profiles: <!nobiarch>
Description: GNU C Library: o32 Development Libraries for MIPS
Contains the symlinks and object files needed to compile and link programs
diff -Nru glibc-2.24/debian/control.in/mips64 glibc-2.24/debian/control.in/mips64
--- glibc-2.24/debian/control.in/mips64 2017-06-18 16:13:52.000000000 +0200
+++ glibc-2.24/debian/control.in/mips64 2017-07-31 13:03:42.000000000 +0200
@@ -16,6 +16,15 @@
Provides: lib64c-dev
Depends: libc6-mips64 (= ${binary:Version}), libc6-dev (= ${binary:Version}), ${misc:Depends}
Recommends: gcc-multilib
+Conflicts: libc6-dev-amd64,
+ libc6-dev-i386,
+ libc6-dev-mips32,
+ libc6-dev-mipsn32,
+ libc6-dev-powerpc,
+ libc6-dev-ppc64,
+ libc6-dev-sparc,
+ libc6-dev-sparc64,
+ libc6-dev-x32
Build-Profiles: <!nobiarch>
Description: GNU C Library: 64bit Development Libraries for MIPS64
Contains the symlinks and object files needed to compile and link programs
diff -Nru glibc-2.24/debian/control.in/mipsn32 glibc-2.24/debian/control.in/mipsn32
--- glibc-2.24/debian/control.in/mipsn32 2017-06-18 16:13:52.000000000 +0200
+++ glibc-2.24/debian/control.in/mipsn32 2017-07-31 13:03:42.000000000 +0200
@@ -16,6 +16,15 @@
Provides: libn32c-dev
Depends: libc6-mipsn32 (= ${binary:Version}), libc6-dev-mips64 (= ${binary:Version}) [mips mipsel], libc6-dev (= ${binary:Version}), ${misc:Depends}
Recommends: gcc-multilib
+Conflicts: libc6-dev-amd64,
+ libc6-dev-i386,
+ libc6-dev-mips32,
+ libc6-dev-mips64,
+ libc6-dev-powerpc,
+ libc6-dev-ppc64,
+ libc6-dev-sparc,
+ libc6-dev-sparc64,
+ libc6-dev-x32
Build-Profiles: <!nobiarch>
Description: GNU C Library: n32 Development Libraries for MIPS64
Contains the symlinks and object files needed to compile and link programs
diff -Nru glibc-2.24/debian/control.in/powerpc glibc-2.24/debian/control.in/powerpc
--- glibc-2.24/debian/control.in/powerpc 2017-06-18 16:13:52.000000000 +0200
+++ glibc-2.24/debian/control.in/powerpc 2017-07-31 13:03:42.000000000 +0200
@@ -16,6 +16,15 @@
Provides: lib32c-dev
Depends: libc6-powerpc (= ${binary:Version}), libc6-dev (= ${binary:Version}), ${misc:Depends}
Recommends: gcc-multilib
+Conflicts: libc6-dev-amd64,
+ libc6-dev-i386,
+ libc6-dev-mips32,
+ libc6-dev-mips64,
+ libc6-dev-mipsn32,
+ libc6-dev-ppc64,
+ libc6-dev-sparc,
+ libc6-dev-sparc64,
+ libc6-dev-x32
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
diff -Nru glibc-2.24/debian/control.in/ppc64 glibc-2.24/debian/control.in/ppc64
--- glibc-2.24/debian/control.in/ppc64 2017-06-18 16:13:52.000000000 +0200
+++ glibc-2.24/debian/control.in/ppc64 2017-07-31 13:03:42.000000000 +0200
@@ -16,6 +16,15 @@
Provides: lib64c-dev
Depends: libc6-ppc64 (= ${binary:Version}), libc6-dev (= ${binary:Version}), ${misc:Depends}
Recommends: gcc-multilib
+Conflicts: libc6-dev-amd64,
+ libc6-dev-i386,
+ libc6-dev-mips32,
+ libc6-dev-mips64,
+ libc6-dev-mipsn32,
+ libc6-dev-powerpc,
+ libc6-dev-sparc,
+ libc6-dev-sparc64,
+ libc6-dev-x32
Build-Profiles: <!nobiarch>
Description: GNU C Library: 64bit Development Libraries for PowerPC64
Contains the symlinks and object files needed to compile and link programs
diff -Nru glibc-2.24/debian/control.in/sparc glibc-2.24/debian/control.in/sparc
--- glibc-2.24/debian/control.in/sparc 2017-06-18 16:13:52.000000000 +0200
+++ glibc-2.24/debian/control.in/sparc 2017-07-31 13:03:42.000000000 +0200
@@ -16,6 +16,15 @@
Provides: lib32c-dev
Depends: libc6-sparc (= ${binary:Version}), libc6-dev (= ${binary:Version}), ${misc:Depends}
Recommends: gcc-multilib
+Conflicts: libc6-dev-amd64,
+ libc6-dev-i386,
+ libc6-dev-mips32,
+ libc6-dev-mips64,
+ libc6-dev-mipsn32,
+ libc6-dev-powerpc,
+ libc6-dev-ppc64,
+ libc6-dev-sparc64,
+ libc6-dev-x32
Build-Profiles: <!nobiarch>
Description: GNU C Library: 32bit Development Libraries for SPARC
Contains the symlinks and object files needed to compile and link programs
diff -Nru glibc-2.24/debian/control.in/sparc64 glibc-2.24/debian/control.in/sparc64
--- glibc-2.24/debian/control.in/sparc64 2017-06-18 16:13:52.000000000 +0200
+++ glibc-2.24/debian/control.in/sparc64 2017-07-31 13:03:42.000000000 +0200
@@ -16,6 +16,15 @@
Provides: lib64c-dev
Depends: libc6-sparc64 (= ${binary:Version}), libc6-dev (= ${binary:Version}), ${misc:Depends}
Recommends: gcc-multilib
+Conflicts: libc6-dev-amd64,
+ libc6-dev-i386,
+ libc6-dev-mips32,
+ libc6-dev-mips64,
+ libc6-dev-mipsn32,
+ libc6-dev-powerpc,
+ libc6-dev-ppc64,
+ libc6-dev-sparc,
+ libc6-dev-x32
Build-Profiles: <!nobiarch>
Description: GNU C Library: 64bit Development Libraries for UltraSPARC
Contains the symlinks and object files needed to compile and link programs
diff -Nru glibc-2.24/debian/control.in/x32 glibc-2.24/debian/control.in/x32
--- glibc-2.24/debian/control.in/x32 2017-04-09 23:28:38.000000000 +0200
+++ glibc-2.24/debian/control.in/x32 2017-07-31 13:03:42.000000000 +0200
@@ -14,6 +14,15 @@
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}
+Conflicts: libc6-dev-amd64,
+ libc6-dev-i386,
+ libc6-dev-mips32,
+ libc6-dev-mips64,
+ libc6-dev-mipsn32,
+ libc6-dev-powerpc,
+ libc6-dev-ppc64,
+ libc6-dev-sparc,
+ libc6-dev-sparc64
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
