Bug#876253: libmpeg3 FTCBFS: uses the build architecture compiler

[Manuel A. Fernandez Montecelo]

Control: tags -1 + pending
Control: tags 845290 + pending


Hi,

2017-09-20 09:59 Helmut Grohne:

Source: libmpeg3
Version: 1.8.dfsg-2
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap

libmpeg3 fails to cross build from source, because it uses the build
architecture compiler. After letting dh_auto_build pass cross compilers
to make, the build proceeds a lot further but fails on errors from
debian-build-rules.patch. It confuses the build architecture (dpkg
--print-architecture or DEB_BUILD_ARCH) with the host architecture
(DEB_HOST_ARCH) and hard codes the build architecture compiler (gcc).
After fixing all of that, libmpeg3 cross builds successfully. Please
consider applying the attached patch.


I uploaded a package as NMU with delay 10, with this fix as well as
removing David Martínez Moreno as main maintainer as requested in
#845290.

Since the package is in collab-maint, I pushed the changes there as
well, but I attach the diff here for convenience.

If it's not OK for you I can cancel the NMU, if it's OK please let me
know and I will reschedule it to happen sooner.


Cheers.
--
Manuel A. Fernandez Montecelo 
diff -Nru libmpeg3-1.8.dfsg/debian/changelog libmpeg3-1.8.dfsg/debian/changelog
--- libmpeg3-1.8.dfsg/debian/changelog  2014-06-06 07:54:22.0 +0200
+++ libmpeg3-1.8.dfsg/debian/changelog  2017-11-06 22:24:08.0 +0100
@@ -1,3 +1,16 @@
+libmpeg3 (1.8.dfsg-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Promote Petter Reinholdtsen as Maintainer, remove David Martínez
+Moreno (Closes: #845290)
+
+  [ Helmut Grohne ]
+  * Fix FTCBFS: (Closes: #876253)
++ Let dh_auto_build pass cross compilers to make.
++ Fix the debian-build-rules.patch.
+
+ -- Manuel A. Fernandez Montecelo   Mon, 06 Nov 2017 22:24:08 
+0100
+
 libmpeg3 (1.8.dfsg-2) unstable; urgency=low
 
   * Add patch header-comment-fix.patch to fix a typo in the
diff -Nru libmpeg3-1.8.dfsg/debian/control libmpeg3-1.8.dfsg/debian/control
--- libmpeg3-1.8.dfsg/debian/control2014-06-06 07:54:22.0 +0200
+++ libmpeg3-1.8.dfsg/debian/control2017-11-06 22:11:37.0 +0100
@@ -1,8 +1,7 @@
 Source: libmpeg3
 Section: libs
 Priority: optional
-Maintainer: David Martínez Moreno 
-Uploaders: Petter Reinholdtsen 
+Maintainer: Petter Reinholdtsen 
 Standards-Version: 3.9.5
 Build-Depends: debhelper (>= 9), liba52-dev
 Homepage: http://heroines.sourceforge.net/libmpeg3.php
diff -Nru libmpeg3-1.8.dfsg/debian/patches/debian-build-rules.patch 
libmpeg3-1.8.dfsg/debian/patches/debian-build-rules.patch
--- libmpeg3-1.8.dfsg/debian/patches/debian-build-rules.patch   2014-06-06 
07:54:22.0 +0200
+++ libmpeg3-1.8.dfsg/debian/patches/debian-build-rules.patch   2017-11-06 
22:18:45.0 +0100
@@ -37,7 +37,7 @@
  
  
  OBJDIR := $(shell uname --machine)
-+ARCH := $(shell dpkg --print-architecture)
++ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
  
  
 +ifeq ($(strip $(prefix)),)
@@ -163,7 +163,7 @@
ar rcs $(OUTPUT) `cat $(OBJDIR)/objs`
  
 +$(SHAREDOUTPUT): $(SOBJS)
-+  gcc -shared -fPIC $(LDFLAGS) -o $(SHAREDOUTPUT) \
++  $(CC) -shared -fPIC $(LDFLAGS) -o $(SHAREDOUTPUT) \
 +   $(SOBJS) \
 +   -Wl,-soname -Wl,$(SHLIB_SONAME) $(LIBS)
 +  ( cd $(OBJDIR); \
diff -Nru libmpeg3-1.8.dfsg/debian/rules libmpeg3-1.8.dfsg/debian/rules
--- libmpeg3-1.8.dfsg/debian/rules  2014-06-06 07:54:22.0 +0200
+++ libmpeg3-1.8.dfsg/debian/rules  2017-11-06 22:18:45.0 +0100
@@ -30,7 +30,7 @@
 build-stamp:
dh_testdir
 
-   $(MAKE)
+   dh_auto_build --buildsystem=makefile
 
touch build-stamp
 

Bug#876253: libmpeg3 FTCBFS: uses the build architecture compiler

[Helmut Grohne]

Source: libmpeg3
Version: 1.8.dfsg-2
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap

libmpeg3 fails to cross build from source, because it uses the build
architecture compiler. After letting dh_auto_build pass cross compilers
to make, the build proceeds a lot further but fails on errors from
debian-build-rules.patch. It confuses the build architecture (dpkg
--print-architecture or DEB_BUILD_ARCH) with the host architecture
(DEB_HOST_ARCH) and hard codes the build architecture compiler (gcc).
After fixing all of that, libmpeg3 cross builds successfully. Please
consider applying the attached patch.

Helmut
diff --minimal -Nru libmpeg3-1.8.dfsg/debian/changelog 
libmpeg3-1.8.dfsg/debian/changelog
--- libmpeg3-1.8.dfsg/debian/changelog  2014-06-06 07:54:25.0 +0200
+++ libmpeg3-1.8.dfsg/debian/changelog  2017-09-20 09:42:49.0 +0200
@@ -1,3 +1,12 @@
+libmpeg3 (1.8.dfsg-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: (Closes: #-1)
++ Let dh_auto_build pass cross compilers to make.
++ Fix the debian-build-rules.patch.
+
+ -- Helmut Grohne   Wed, 20 Sep 2017 09:42:49 +0200
+
 libmpeg3 (1.8.dfsg-2) unstable; urgency=low
 
   * Add patch header-comment-fix.patch to fix a typo in the
diff --minimal -Nru libmpeg3-1.8.dfsg/debian/patches/debian-build-rules.patch 
libmpeg3-1.8.dfsg/debian/patches/debian-build-rules.patch
--- libmpeg3-1.8.dfsg/debian/patches/debian-build-rules.patch   2014-06-02 
08:50:27.0 +0200
+++ libmpeg3-1.8.dfsg/debian/patches/debian-build-rules.patch   2017-09-20 
09:42:49.0 +0200
@@ -37,7 +37,7 @@
  
  
  OBJDIR := $(shell uname --machine)
-+ARCH := $(shell dpkg --print-architecture)
++ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
  
  
 +ifeq ($(strip $(prefix)),)
@@ -163,7 +163,7 @@
ar rcs $(OUTPUT) `cat $(OBJDIR)/objs`
  
 +$(SHAREDOUTPUT): $(SOBJS)
-+  gcc -shared -fPIC $(LDFLAGS) -o $(SHAREDOUTPUT) \
++  $(CC) -shared -fPIC $(LDFLAGS) -o $(SHAREDOUTPUT) \
 +   $(SOBJS) \
 +   -Wl,-soname -Wl,$(SHLIB_SONAME) $(LIBS)
 +  ( cd $(OBJDIR); \
diff --minimal -Nru libmpeg3-1.8.dfsg/debian/rules 
libmpeg3-1.8.dfsg/debian/rules
--- libmpeg3-1.8.dfsg/debian/rules  2014-06-02 08:50:27.0 +0200
+++ libmpeg3-1.8.dfsg/debian/rules  2017-09-20 09:42:48.0 +0200
@@ -30,7 +30,7 @@
 build-stamp:
dh_testdir
 
-   $(MAKE)
+   dh_auto_build --buildsystem=makefile
 
touch build-stamp