Bug#839857: lzma FTCBFS: uses build architecture compiler

[Manuel A. Fernandez Montecelo]

2017-09-24 23:58 Manuel A. Fernandez Montecelo:


I just uploaded an NMU with delayed/15, debdiff attached.

If you want me to cancel it just ask.


Rescheduling to upload now -- more than 10 days passed without replies
(which is a common recommendation of delay for NMU), and I will have
more time to fix issues if they arise in the coming weekend that the
next.

--
Manuel A. Fernandez Montecelo 

Bug#839857: lzma FTCBFS: uses build architecture compiler

[Manuel A. Fernandez Montecelo]

Control: tags -1 + pending


Hi,

2016-10-05 20:49 Helmut Grohne:

Source: lzma
Version: 9.22-2
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap

lzma fails to cross build from source, because it uses the build
architecture toolchain which leads to a dh_strip failure when using host
tools. Since debhelper 10.2.1, dh_auto_build knows how to pass cross
toolchains via the makefile buildsystem, so replacing the explicit make
invocations with dh_auto_build mostly fixes the cross build except for
the odd use of CXX_C instead of CC. After applying the attached patch,
lzma cross builds fine. Please consider applying it to the package.


I just uploaded an NMU with delayed/15, debdiff attached.

If you want me to cancel it just ask.


Cheers.
--
Manuel A. Fernandez Montecelo 

diff -Nru lzma-9.22/debian/changelog lzma-9.22/debian/changelog
--- lzma-9.22/debian/changelog  2012-01-08 15:15:18.0 +0100
+++ lzma-9.22/debian/changelog  2017-09-24 23:48:30.0 +0200
@@ -1,3 +1,13 @@
+lzma (9.22-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix typo in description, thanks Pascal De Vuyst (Closes: #714875)
+
+  [ Helmut Grohne ]
+  * Fix FTCBFS: Let dh_auto_build pass cross flags. (Closes: #839857)
+
+ -- Manuel A. Fernandez Montecelo   Sun, 24 Sep 2017 23:48:30 
+0200
+
 lzma (9.22-2) unstable; urgency=low
 
   * Upload to unstable.
diff -Nru lzma-9.22/debian/control lzma-9.22/debian/control
--- lzma-9.22/debian/control2011-09-03 23:38:22.0 +0200
+++ lzma-9.22/debian/control2017-09-24 23:48:30.0 +0200
@@ -14,7 +14,7 @@
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: xz-lzma (<< 5.1.1alpha+20110809-2)
 Description: Compression and decompression in the LZMA format - command line 
utility
- The Lempel-Ziv Markov-chain Algorithm is a compression method based on
+ The Lempel-Ziv-Markov chain Algorithm is a compression method based on
  the famous LZ77 algorithm, and was first introduced by 7-Zip for use in
  7z archives.
  .
@@ -31,7 +31,7 @@
 Conflicts: lzma (<< 4.43-13)
 Replaces: lzma (<< 4.43-13)
 Description: Compression and decompression in the LZMA format - legacy utility
- The Lempel-Ziv Markov-chain Algorithm is a compression method based on
+ The Lempel-Ziv-Markov chain Algorithm is a compression method based on
  the famous LZ77 algorithm, and was first introduced by 7-Zip for use in
  7z archives.
  .
@@ -46,7 +46,7 @@
 Architecture: all
 Depends: zlib1g-dev, ${misc:Depends}
 Description: Compression and decompression in the LZMA format - development 
files
- The Lempel-Ziv Markov-chain Algorithm is a compression method based on
+ The Lempel-Ziv-Markov chain Algorithm is a compression method based on
  the famous LZ77 algorithm, and was first introduced by 7-Zip for use in
  7z archives.
  .
diff -Nru lzma-9.22/debian/rules lzma-9.22/debian/rules
--- lzma-9.22/debian/rules  2011-09-03 23:38:22.0 +0200
+++ lzma-9.22/debian/rules  2017-09-24 23:48:30.0 +0200
@@ -20,8 +20,8 @@
 export DH_OPTIONS
 
 override_dh_auto_build:
-   $(MAKE) all -C $(SRC_DIR_C) -f makefile.gcc
-   $(MAKE) all -C $(SRC_DIR_CPP) -f makefile.gcc
+   dh_auto_build -- all -C $(SRC_DIR_C) -f makefile.gcc
+   dh_auto_build -- all -C $(SRC_DIR_CPP) -f makefile.gcc CXX_C='$$(CC)'
 
 override_dh_auto_clean:
$(MAKE) clean -C $(SRC_DIR_C) -f makefile.gcc
@@ -30,4 +30,4 @@
$(SRC_DIR_CPP)/*.o $(SRC_DIR_CPP)/*.a
 
 %:
-   dh $@ 
+   dh $@ --buildsystem=makefile

Bug#839857: lzma FTCBFS: uses build architecture compiler

[Helmut Grohne]

Source: lzma
Version: 9.22-2
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap

lzma fails to cross build from source, because it uses the build
architecture toolchain which leads to a dh_strip failure when using host
tools. Since debhelper 10.2.1, dh_auto_build knows how to pass cross
toolchains via the makefile buildsystem, so replacing the explicit make
invocations with dh_auto_build mostly fixes the cross build except for
the odd use of CXX_C instead of CC. After applying the attached patch,
lzma cross builds fine. Please consider applying it to the package.

Helmut
diff --minimal -Nru lzma-9.22/debian/changelog lzma-9.22/debian/changelog
--- lzma-9.22/debian/changelog  2012-01-08 15:30:10.0 +0100
+++ lzma-9.22/debian/changelog  2016-10-05 19:17:55.0 +0200
@@ -1,3 +1,10 @@
+lzma (9.22-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Let dh_auto_build pass cross flags. (Closes: #-1)
+
+ -- Helmut Grohne   Wed, 05 Oct 2016 19:17:41 +0200
+
 lzma (9.22-2) unstable; urgency=low
 
   * Upload to unstable.
diff --minimal -Nru lzma-9.22/debian/rules lzma-9.22/debian/rules
--- lzma-9.22/debian/rules  2011-09-03 23:38:22.0 +0200
+++ lzma-9.22/debian/rules  2016-10-05 19:24:06.0 +0200
@@ -20,8 +20,8 @@
 export DH_OPTIONS
 
 override_dh_auto_build:
-   $(MAKE) all -C $(SRC_DIR_C) -f makefile.gcc
-   $(MAKE) all -C $(SRC_DIR_CPP) -f makefile.gcc
+   dh_auto_build -- all -C $(SRC_DIR_C) -f makefile.gcc
+   dh_auto_build -- all -C $(SRC_DIR_CPP) -f makefile.gcc CXX_C='$$(CC)'
 
 override_dh_auto_clean:
$(MAKE) clean -C $(SRC_DIR_C) -f makefile.gcc
@@ -30,4 +30,4 @@
$(SRC_DIR_CPP)/*.o $(SRC_DIR_CPP)/*.a
 
 %:
-   dh $@ 
+   dh $@ --buildsystem=makefile