Source: gdisk
Version: 1.0.1-1
Tags: patch
User: [email protected]
Usertags: rebootstrap

gdisk fails to cross build from source, because it uses the build
architecture compiler and thus dh_strip (which uses the host
architecture strip) fails. The attached patch passes a triplet-prefixed
compiler via CXX that will work in all cross and native builds.

Helmut
diff --minimal -Nru gdisk-1.0.1/debian/changelog gdisk-1.0.1/debian/changelog
--- gdisk-1.0.1/debian/changelog        2015-10-23 21:49:57.000000000 +0200
+++ gdisk-1.0.1/debian/changelog        2016-09-03 13:31:58.000000000 +0200
@@ -1,3 +1,10 @@
+gdisk (1.0.1-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Pass triplet-prefixed CXX to make. (Closes: #-1)
+
+ -- Helmut Grohne <[email protected]>  Sat, 03 Sep 2016 13:31:40 +0200
+
 gdisk (1.0.1-1) unstable; urgency=medium
 
   * New upstream release, drop included patches:
diff --minimal -Nru gdisk-1.0.1/debian/rules gdisk-1.0.1/debian/rules
--- gdisk-1.0.1/debian/rules    2015-05-10 23:49:02.000000000 +0200
+++ gdisk-1.0.1/debian/rules    2016-09-03 13:31:38.000000000 +0200
@@ -4,13 +4,18 @@
 # hardening options at build time
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
+include /usr/share/dpkg/architecture.mk
+ifeq ($(origin CXX),default)
+       CXX = $(DEB_HOST_GNU_TYPE)-g++
+endif
+
 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
        NUMJOBS = $(patsubst parallel=%,%,$(filter 
parallel=%,$(DEB_BUILD_OPTIONS)))
        MAKEFLAGS += -j$(NUMJOBS)
 endif
 
 override_dh_auto_build:
-       dh_auto_build --parallel
+       dh_auto_build --parallel -- CXX=$(CXX)
 
 # Upstream Makefile don't provide install rule
 override_dh_install:

Reply via email to