Source: cabextract
Version: 1.6-1
Tags: patch
User: [email protected]
Usertags: rebootstrap

cabextract fails to cross build from source, because it uses the build
architecture compiler. In the attached patch, I am moving cabextract to
compat level 7 to use dh_auto_configure, which knows when to pass a
--host option to configure. Beyond applying the patch exporting
ac_cv_func_fnmatch_works=yes is necessary to obtain a working cross
build for linux/glibc systems. Please consider applying the attached
patch.

Helmut
diff --minimal -Nru cabextract-1.6/debian/changelog 
cabextract-1.6/debian/changelog
--- cabextract-1.6/debian/changelog     2015-04-03 01:38:58.000000000 +0200
+++ cabextract-1.6/debian/changelog     2016-09-27 21:23:18.000000000 +0200
@@ -1,3 +1,10 @@
+cabextract (1.6-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Use dh_auto_configure and dh_auto_install: Closes: #-1
+
+ -- Helmut Grohne <[email protected]>  Tue, 27 Sep 2016 21:22:58 +0200
+
 cabextract (1.6-1) unstable; urgency=medium
 
   * New upstream release: Closes: #778753
diff --minimal -Nru cabextract-1.6/debian/compat cabextract-1.6/debian/compat
--- cabextract-1.6/debian/compat        2014-12-16 20:26:58.000000000 +0100
+++ cabextract-1.6/debian/compat        2016-09-27 21:21:30.000000000 +0200
@@ -1 +1 @@
-6
+7
diff --minimal -Nru cabextract-1.6/debian/control cabextract-1.6/debian/control
--- cabextract-1.6/debian/control       2014-12-16 20:51:46.000000000 +0100
+++ cabextract-1.6/debian/control       2016-09-27 21:21:44.000000000 +0200
@@ -2,7 +2,7 @@
 Section: utils
 Priority: optional
 Maintainer: Eric Sharkey <[email protected]>
-Build-Depends: debhelper (>> 6.0.0), sharutils, libmspack-dev
+Build-Depends: debhelper (>= 7), sharutils, libmspack-dev
 Standards-Version: 3.9.6
 
 Package: cabextract
diff --minimal -Nru cabextract-1.6/debian/rules cabextract-1.6/debian/rules
--- cabextract-1.6/debian/rules 2014-12-16 20:36:49.000000000 +0100
+++ cabextract-1.6/debian/rules 2016-09-27 21:22:56.000000000 +0200
@@ -13,7 +13,7 @@
 configure-stamp:
        dh_testdir
        # Add here commands to configure the package.
-       ./configure CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" 
LDFLAGS="$(LDFLAGS)" --prefix=$(CURDIR)/debian/cabextract/usr 
--mandir=$(CURDIR)/debian/cabextract/usr/share/man 
--infodir=$(CURDIR)/debian/cabextract/usr/share/info 
--with-external-libmspack=yes
+       dh_auto_configure -- CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" 
LDFLAGS="$(LDFLAGS)" --with-external-libmspack=yes
        
 
        touch configure-stamp
@@ -48,7 +48,7 @@
        dh_installdirs
 
        # Add here commands to install the package into debian/cabextract.
-       \$(MAKE) install
+       dh_auto_install
        cp $(CURDIR)/debian/cabextract.desktop 
$(CURDIR)/debian/cabextract/usr/share/apps/konqueror/servicemenus/
        cp $(CURDIR)/debian/cabextract.desktop.kde4 
$(CURDIR)/debian/cabextract/usr/share/kde4/services/ServiceMenus/cabextract.desktop
        uudecode -o $(CURDIR)/debian/cabextract/usr/share/icons/cab_extract.png 
$(CURDIR)/debian/cab_extract.png.uu

Reply via email to