Source: mp3check Version: 0.8.7-2 Tags: patch User: [email protected] Usertags: rebootstrap
mp3check fails to cross build from source, because it uses the build architecture compiler. Beyond that it assumes that CC is a C++ compiler and it uses the build architecture strip. The attached patch fixes all of that and makes mp3check cross build successfully. Please consider applying it. Helmut
diff --minimal -Nru mp3check-0.8.7/debian/changelog mp3check-0.8.7/debian/changelog --- mp3check-0.8.7/debian/changelog 2013-10-17 00:36:17.000000000 +0200 +++ mp3check-0.8.7/debian/changelog 2017-06-25 12:05:30.000000000 +0200 @@ -1,3 +1,13 @@ +mp3check (0.8.7-2.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Fix FTCBFS: (Closes: #-1) + + Instruct dh_auto_build to pass cross compilers. + + Upstream expects CC to contain a C++ compiler. + + Add debian/patches/nostrip.patch. + + -- Helmut Grohne <[email protected]> Sun, 25 Jun 2017 12:05:30 +0200 + mp3check (0.8.7-2) unstable; urgency=low * debian/patches/40_bts726068_remove_truncated_last_frame.patch diff --minimal -Nru mp3check-0.8.7/debian/patches/nostrip.patch mp3check-0.8.7/debian/patches/nostrip.patch --- mp3check-0.8.7/debian/patches/nostrip.patch 1970-01-01 01:00:00.000000000 +0100 +++ mp3check-0.8.7/debian/patches/nostrip.patch 2017-06-25 12:05:30.000000000 +0200 @@ -0,0 +1,20 @@ +From: Helmut Grohne <[email protected]> +Subject: do not strip during install + +* breaks cross building +* breaks -dbgsym packages +* breaks DEB_BUILD_OPTIONS=nostrip + +Index: mp3check-0.8.7/Makefile +=================================================================== +--- mp3check-0.8.7.orig/Makefile ++++ mp3check-0.8.7/Makefile +@@ -34,7 +34,7 @@ + strip: + strip $(TARGET) + +-install: all strip ++install: all + mkdir -p $(DESTDIR)/usr/bin + cp $(TARGET) $(DESTDIR)/usr/bin + diff --minimal -Nru mp3check-0.8.7/debian/patches/series mp3check-0.8.7/debian/patches/series --- mp3check-0.8.7/debian/patches/series 2013-10-17 00:36:17.000000000 +0200 +++ mp3check-0.8.7/debian/patches/series 2017-06-25 12:05:30.000000000 +0200 @@ -3,3 +3,4 @@ 20_use_destdir_to_install.patch 30_hardening.patch 40_bts726068_remove_truncated_last_frame.patch +nostrip.patch diff --minimal -Nru mp3check-0.8.7/debian/rules mp3check-0.8.7/debian/rules --- mp3check-0.8.7/debian/rules 2013-10-17 00:36:17.000000000 +0200 +++ mp3check-0.8.7/debian/rules 2017-06-25 12:05:30.000000000 +0200 @@ -12,5 +12,9 @@ %: dh $@ +override_dh_auto_build: + # Let dh_auto_build pass flags to make as configure didn't do much. + dh_auto_build --buildsystem=makefile -- CC='$$(CXX)' + override_dh_installman: dh_installman mp3check.1
