Bug#962642: temporarily revert lib64 libraries

[Helmut Grohne]

Control: retitle -1 gmp FTCBFS and misses nobiarch build profile support
Control: user debian-cross at lists.debian.org
Control: usertags -1 + cross-satisfiability
Control: tags -1 + patch
Control: affects 962677 + src:gmp

On Thu, Jun 11, 2020 at 06:37:38AM +0200, Helmut Grohne wrote:
> gmp added a g++-multilib dependency. Doing so breaks cross building and
> thus cross bootstrap. Please use a cross-translatable
> g++-multilib-for-host dependency.  Unfortunately, gcc does not presently
> provide those. They're being added in #666743. Therefore, I ask for
> temporarily reverting the lib64 libraries and adding them once toolchain
> dependency translation is supported by gcc.

I found another alternative that makes the multilibs work while not
breaking bootstrap nor cross building:

Since the g++-multilib is restricted to a small set of architectures, we
can spell out the cross translation. It'll still fail until #962677 is
fixed, but that should be solvable. This is ugly, but it also is
temporary.

Beyond this, support for bootstrapping without multilb is needed. This
is achieved by implementing the nobiarch profile.

Please fix this issue quickly, because satisfiability issues are
difficult to work around.

Helmut
-------------- next part --------------
diff --minimal -Nru gmp-6.2.0+dfsg/debian/changelog gmp-6.2.0+dfsg/debian/changelog
--- gmp-6.2.0+dfsg/debian/changelog	2020-05-14 07:49:24.000000000 +0200
+++ gmp-6.2.0+dfsg/debian/changelog	2020-06-11 17:43:36.000000000 +0200
@@ -1,3 +1,12 @@
+gmp (2:6.2.0+dfsg-5.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Use cross-compatible per-arch dependencies for g++-mulitlib.
+   (Closes: #-1)
+  * Add support for the nobiarch build profile.
+
+ -- Helmut Grohne <helmut at subdivi.de>  Thu, 11 Jun 2020 17:43:36 +0200
+
 gmp (2:6.2.0+dfsg-5) unstable; urgency=medium
 
   * Team Upload.
diff --minimal -Nru gmp-6.2.0+dfsg/debian/control gmp-6.2.0+dfsg/debian/control
--- gmp-6.2.0+dfsg/debian/control	2020-05-14 07:48:55.000000000 +0200
+++ gmp-6.2.0+dfsg/debian/control	2020-06-11 17:43:36.000000000 +0200
@@ -3,7 +3,21 @@
 Uploaders: Steve M. Robbins <smr at debian.org>
 Section: libs
 Priority: optional
-Build-Depends: m4, debhelper (>= 9), g++-multilib [i386 x32 powerpc mips mipsel mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6el]
+Build-Depends:
+ m4,
+ debhelper (>= 9),
+ g++-multilib [i386 x32 powerpc mips mipsel mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6el] <!cross !nobiarch>,
+ g++-multilib-i686-linux-gnu:native [i386] <cross !nobiarch>,
+ g++-multilib-x86-64-linux-gnux32 [x32] <cross !nobiarch>,
+ g++-multilib-powerpc-linux-gnu [powerpc] <cross !nobiarch>,
+ g++-multilib-mips-linux-gnu [mips] <cross !nobiarch>,
+ g++-multilib-mipsel-linux-gnu [mipsel] <cross !nobiarch>,
+ g++-multilib-mips64-linux-gnuabin32 [mipsn32] <cross !nobiarch>,
+ g++-multilib-mips64el-linux-gnuabin32 [mipsn32el] <cross !nobiarch>,
+ g++-multilib-mipsisa32r6-linux-gnu [mipsr6] <cross !nobiarch>,
+ g++-multilib-mipsisa32r6el-linux-gnu [mipsr6el] <cross !nobiarch>,
+ g++-multilib-mipsisa64r6-linux-gnuabin32 [mipsn32r6] <cross !nobiarch>,
+ g++-multilib-mipsisa64r6el-linux-gnuabin32 [mipsn32r6el] <cross !nobiarch>,
 Standards-Version: 4.1.3
 Vcs-Browser: https://salsa.debian.org/science-team/gmp
 Vcs-Git: https://salsa.debian.org/science-team/gmp.git
@@ -28,6 +42,7 @@
 
 Package: lib64gmp10
 Architecture: i386 x32 powerpc mips mipsel mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6el
+Build-Profiles: <!nobiarch>
 Multi-Arch: no
 Section: libs
 Priority: optional
@@ -60,6 +75,7 @@
 
 Package: lib64gmpxx4ldbl
 Architecture: i386 x32 powerpc mips mipsel mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6el
+Build-Profiles: <!nobiarch>
 Multi-Arch: no
 Section: libs
 Priority: optional
@@ -99,6 +115,7 @@
 
 Package: lib64gmp-dev
 Architecture: i386 x32 powerpc mips mipsel mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6el
+Build-Profiles: <!nobiarch>
 Multi-Arch: no
 Section: libdevel
 Priority: optional
diff --minimal -Nru gmp-6.2.0+dfsg/debian/rules gmp-6.2.0+dfsg/debian/rules
--- gmp-6.2.0+dfsg/debian/rules	2020-05-14 07:48:55.000000000 +0200
+++ gmp-6.2.0+dfsg/debian/rules	2020-06-11 17:38:44.000000000 +0200
@@ -46,7 +46,11 @@
   confflags += --enable-fat
 endif
 
+ifeq (,$(filter nobiarch,$(DEB_BUILD_PROFILES)))
 lib64_archs = i386 x32 powerpc mips mipsn32 mipsel mipsn32el mipsr6 mipsr6n32 mipsr6el mipsn32r6el
+else
+lib64_archs =
+endif
 ifneq (,$(filter $(DEB_HOST_ARCH), i386 x32))
   host64_gnu_type = x86_64-linux-gnu
   CFLAGS_64 = -m64