Source: liblockfile
Version: 1.09-6
Tags: patch
User: [email protected]
Usertags: rebootstrap

liblockfile cross builds supposedly successfully, but the resulting
packages contain build architecture ELF executables. Switching to host
architecture triplet prefixed tools fixes that. Please consider applying
the attached patch.

Helmut
diff --minimal -Nru liblockfile-1.09/debian/changelog 
liblockfile-1.09/debian/changelog
--- liblockfile-1.09/debian/changelog   2013-06-02 11:46:21.000000000 +0200
+++ liblockfile-1.09/debian/changelog   2016-09-10 14:11:56.000000000 +0200
@@ -1,3 +1,10 @@
+liblockfile (1.09-6.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix cross build: Use triplet prefixed tools. Closes: #-1
+
+ -- Helmut Grohne <[email protected]>  Sat, 10 Sep 2016 14:05:43 +0200
+
 liblockfile (1.09-6) unstable; urgency=low
 
   * Merge 1.09-5ubuntu1
diff --minimal -Nru liblockfile-1.09/debian/rules liblockfile-1.09/debian/rules
--- liblockfile-1.09/debian/rules       2012-06-13 13:26:39.000000000 +0200
+++ liblockfile-1.09/debian/rules       2016-09-10 14:08:45.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
 
 # liblockfile
 MVER   = 1
@@ -15,11 +19,9 @@
 
 INSTALL=install
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-       INSTALL+=-s
+       INSTALL+=-s --strip-program=$(DEB_HOST_GNU_TYPE)-strip
 endif
 
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-
 build-arch:    config.status
        $(checkdir)
        make
@@ -28,7 +30,7 @@
 build-indep:
 
 config.status:
-       ./configure --enable-shared --prefix=/usr \
+       CC=$(CC) ./configure --enable-shared --prefix=/usr \
                --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
                --with-mailgroup --mandir=/usr/share/man
        

Reply via email to