[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#838205: psutils FTCBFS: uses build architecture compiler



Source: psutils
Version: 1.17.dfsg-3
Tags: patch
User: helmutg@debian.org
Usertags: rebootstrap

psutils fails to cross build from source, because it uses the build
architecture compiler. Even though cdbs passes a suitable CC environment
variable, the upstream build system chooses to override that. After
passing CC as a command line variable, the cross build succeeds. Please
consider applying the attached patch.

Helmut
diff --minimal -Nru psutils-1.17.dfsg/debian/changelog psutils-1.17.dfsg/debian/changelog
--- psutils-1.17.dfsg/debian/changelog	2016-08-27 03:59:27.000000000 +0200
+++ psutils-1.17.dfsg/debian/changelog	2016-09-18 14:41:23.000000000 +0200
@@ -1,3 +1,10 @@
+psutils (1.17.dfsg-3.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Pass CC as a cmdline option to make.  (Closes: #-1) 
+
+ -- Helmut Grohne <helmut@subdivi.de>  Sun, 18 Sep 2016 14:41:00 +0200
+
 psutils (1.17.dfsg-3) unstable; urgency=medium
 
   * Orphan package
diff --minimal -Nru psutils-1.17.dfsg/debian/rules psutils-1.17.dfsg/debian/rules
--- psutils-1.17.dfsg/debian/rules	2016-08-27 03:59:27.000000000 +0200
+++ psutils-1.17.dfsg/debian/rules	2016-09-18 14:40:56.000000000 +0200
@@ -4,6 +4,10 @@
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk
+include /usr/share/dpkg/architecture.mk
+ifeq ($(origin CC),default)
+CC = $(DEB_HOST_GNU_TYPE)-gcc
+endif
 
 # Include cdbs rules files.
 include /usr/share/cdbs/1/class/makefile.mk
@@ -11,7 +15,7 @@
 
 CURDIR := $(shell pwd)
 DEB_MAKE_CLEAN_TARGET = realclean
-DEB_MAKE_BUILD_TARGET = prefix=/usr all
+DEB_MAKE_BUILD_TARGET = prefix=/usr CC=$(CC) all
 DEB_MAKE_INSTALL_TARGET = prefix=$(CURDIR)/debian/psutils/usr \
 	  MANDIR=$(CURDIR)/debian/psutils/usr/share/man/man1 \
 	  install

Reply to: