Source: binutils-mipsen
Version: 4~c3
Severity: serious
Tags: patch ftbfs
Justification: fails to build from source (but built successfully in the past)

binutils-mipsen FTBFS since the upload of binutils 2.32.51.20190909-1:

| cd binutils-2.32.51 ;\
|   for i in `ls /<<PKGBUILDDIR>>/debian/patches/binutils/*.patch 2>/dev/null`; 
do \
|     patch -p1 < $i; \
|   done
| patching file debian/rules
| Reversed (or previously applied) patch detected!  Assume -R? [n] 
| Apply anyway? [n] 
| Skipping patch.
| 3 out of 3 hunks ignored -- saving rejects to file debian/rules.rej
| make: *** [debian/rules:62: stamp-dir/prepare] Error 1
| dpkg-buildpackage: error: debian/rules build-arch subprocess returned exit 
status 2

A full build log is available there:
https://buildd.debian.org/status/fetch.php?pkg=binutils-mipsen&arch=i386&ver=4%7Ec3&stamp=1568213813&raw=0

The problem is that binutils 2.32.51.20190909-1 modified the
debian/rules file in a away that is not compatible anymore with
binutils-mipsen.

I have attached a patch to fix the issue. I have added the
binutils-mips-linux-gnu entry to debian/control.in as it got dropped
from binutils. If the package needs to be kept, it probably has to be
added back to binutils, but that will require a coordination between
the two packages. In the long term all those changes should probably
be merged to binutils so that the patch is not necessary anymore.

-- System Information:
Debian Release: bullseye/sid
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 5.2.0-2-amd64 (SMP w/4 CPU cores)
Kernel taint flags: TAINT_WARN, TAINT_OOT_MODULE, TAINT_UNSIGNED_MODULE
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8), LANGUAGE=fr 
(charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru binutils-mipsen-4~c3/debian/changelog 
binutils-mipsen-4~c3.1/debian/changelog
--- binutils-mipsen-4~c3/debian/changelog       2019-09-05 14:12:18.000000000 
+0200
+++ binutils-mipsen-4~c3.1/debian/changelog     2019-09-14 10:42:48.000000000 
+0200
@@ -1,3 +1,12 @@
+binutils-mipsen (4~c3.1) unstable; urgency=medium
+
+  * Non maintainer upload.
+  * Build using binutils 2.32.51.20190909-1.
+  * Update debian/patches/binutils/mips-cross-to-mipsen.patch following the
+    removal of mipsel and mips64el cross from binutils 2.32.51.20190909-1.
+
+ -- Aurelien Jarno <aure...@debian.org>  Sat, 14 Sep 2019 10:42:48 +0200
+
 binutils-mipsen (4~c3) unstable; urgency=medium
 
   * Build using binutils 2.32.51.20190821-2.
diff -Nru binutils-mipsen-4~c3/debian/control 
binutils-mipsen-4~c3.1/debian/control
--- binutils-mipsen-4~c3/debian/control 2019-09-05 14:12:18.000000000 +0200
+++ binutils-mipsen-4~c3.1/debian/control       2019-09-14 10:42:48.000000000 
+0200
@@ -4,7 +4,7 @@
 Maintainer: YunQiang Su <s...@debian.org>
 Build-Depends: debhelper (>= 11), bison, flex,
  dejagnu, chrpath, lsb-release,
- binutils-source (>= 2.32.51.20190821-2)
+ binutils-source (>= 2.32.51.20190909-1)
 Standards-Version: 4.3.0
 Vcs-Browser: https://salsa.debian.org/toolchain-team/binutils-mipsen
 Vcs-Git: https://salsa.debian.org/toolchain-team/binutils-mipsen.git
diff -Nru binutils-mipsen-4~c3/debian/control.in 
binutils-mipsen-4~c3.1/debian/control.in
--- binutils-mipsen-4~c3/debian/control.in      2019-09-05 14:12:18.000000000 
+0200
+++ binutils-mipsen-4~c3.1/debian/control.in    2019-09-14 10:42:48.000000000 
+0200
@@ -4,7 +4,33 @@
 Maintainer: YunQiang Su <s...@debian.org>
 Build-Depends: debhelper (>= 11), bison, flex,
  dejagnu, chrpath, lsb-release,
- binutils-source (>= 2.32.51.20190821-2)
+ binutils-source (>= 2.32.51.20190909-1)
 Standards-Version: 4.3.0
 Vcs-Browser: https://salsa.debian.org/toolchain-team/binutils-mipsen
 Vcs-Git: https://salsa.debian.org/toolchain-team/binutils-mipsen.git
+
+Package: binutils-mips-linux-gnu
+Priority: optional
+Architecture: amd64 i386 x32
+Multi-Arch: allowed
+Depends: binutils-common,
+  ${shlibs:Depends}, ${extraDepends}
+Suggests: binutils-doc
+Provides: 
+Breaks: binutils (<< 2.29-6)
+Replaces: binutils (<< 2.29-6)
+Description: GNU binary utilities, for mips-linux-gnu target
+ This package provides GNU assembler, linker and binary utilities
+ for the mips-linux-gnu target.
+ .
+ You don't need this package unless you plan to cross-compile programs
+ for mips-linux-gnu and mips-linux-gnu is not your native platform.
+
+Package: binutils-mips-linux-gnu-dbg
+Section: debug
+Priority: optional
+Architecture: amd64 i386 x32
+Multi-Arch: foreign
+Depends: binutils-mips-linux-gnu (= ${binary:Version})
+Description: GNU binary utilities, for mips-linux-gnu target (debug symbols)
+ This package provides debug symbols for binutils-mips-linux-gnu.
diff -Nru 
binutils-mipsen-4~c3/debian/patches/binutils/mips-cross-to-mipsen.patch 
binutils-mipsen-4~c3.1/debian/patches/binutils/mips-cross-to-mipsen.patch
--- binutils-mipsen-4~c3/debian/patches/binutils/mips-cross-to-mipsen.patch     
2019-09-05 14:12:18.000000000 +0200
+++ binutils-mipsen-4~c3.1/debian/patches/binutils/mips-cross-to-mipsen.patch   
2019-09-14 10:42:48.000000000 +0200
@@ -1,24 +1,31 @@
 diff -urN binutils-2.32.51/debian/rules binutils-2.32.51-new/debian/rules
 --- binutils-2.32.51/debian/rules      2019-09-06 06:00:23.018252593 +0000
-+++ binutils-2.32.51-new/debian/rules  2019-09-06 06:03:39.386320585 +0000
-@@ -113,7 +113,6 @@
-   ifeq (,$(CROSS_ARCHS))
-     ifneq (,$(filter $(DEB_HOST_ARCH), amd64 i386 x32))
-       CROSS_ARCHS =  s390x ppc64el arm64 armhf armel
--      CROSS_ARCHS += mipsel mips64el
-       CROSS_ARCHS += alpha hppa m68k
-       CROSS_ARCHS += powerpc ppc64 sh4 sparc64
-       CROSS_ARCHS += ia64 riscv64
-@@ -146,7 +145,7 @@
++++ binutils-2.32.51-new/debian/rules  2019-09-14 10:38:39.251339572 +0200
+@@ -145,7 +145,7 @@
    same_source =
    ifeq (,$(CROSS_ARCHS))
      ifneq (,$(filter $(DEB_HOST_ARCH), amd64 i386 x32))
--      CROSS_ARCHS = mips64 mipsn32 mipsn32el
+-      CROSS_ARCHS = mipsel mips64el mips64 mipsn32 mipsn32el
 +      CROSS_ARCHS = mips mipsel mips64 mips64el mipsn32 mipsn32el
        CROSS_ARCHS += mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el
      else
        CROSS_ARCHS =
-@@ -202,8 +201,12 @@
+@@ -182,7 +182,6 @@
+ HOST_ARCHS_armhf = amd64 i386 x32 arm64 ppc64el
+ HOST_ARCHS_armel = amd64 i386 x32 arm64 ppc64el
+ HOST_ARCHS_arm64 = amd64 i386 x32 ppc64el
+-HOST_ARCHS_mipsel = amd64 i386 x32
+ HOST_ARCHS_powerpc = amd64 i386 x32 ppc64el
+ HOST_ARCHS_ppc64el = amd64 i386 x32 ppc64 arm64
+ HOST_ARCHS_s390x = amd64 i386 x32 arm64 ppc64el
+@@ -194,15 +193,17 @@
+ HOST_ARCHS_alpha = amd64 i386 x32
+ HOST_ARCHS_hppa = amd64 i386 x32
+ HOST_ARCHS_m68k = amd64 i386 x32
+-HOST_ARCHS_mips64 = amd64 i386 x32
+-HOST_ARCHS_mips64el = amd64 i386 x32
+ HOST_ARCHS_ppc64 = amd64 i386 x32 ppc64el
+ HOST_ARCHS_sh4 = amd64 i386 x32
  HOST_ARCHS_sparc64 = amd64 i386 x32
  HOST_ARCHS_x32 = amd64 arm64 i386 ppc64el
  
@@ -31,3 +38,4 @@
  
  HOST_ARCHS_mipsr6 = amd64 i386 x32
  HOST_ARCHS_mipsr6el = amd64 i386 x32
+

Reply via email to