Source: refind
Version: 0.11.2-1
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap

refind fails to cross build from source, because it uses the build
architecture toolchain. Using dh_auto_build mostly fixes that, but the
build system also needs an ARCH variable for cross building. After doing
both, refind cross builds successfully. Please consider applying the
attached patch.

Helmut
diff --minimal -Nru refind-0.11.2/debian/changelog 
refind-0.11.2/debian/changelog
--- refind-0.11.2/debian/changelog      2017-12-05 00:39:01.000000000 +0100
+++ refind-0.11.2/debian/changelog      2018-04-24 06:14:41.000000000 +0200
@@ -1,3 +1,12 @@
+refind (0.11.2-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: (Closes: #-1)
+    + Pass ARCH= to make.
+    + Let dh_auto_build pass cross tools to make.
+
+ -- Helmut Grohne <hel...@subdivi.de>  Tue, 24 Apr 2018 06:14:41 +0200
+
 refind (0.11.2-1) unstable; urgency=medium
 
   * Update to 0.11.2 upstream release
diff --minimal -Nru refind-0.11.2/debian/rules refind-0.11.2/debian/rules
--- refind-0.11.2/debian/rules  2015-12-01 05:09:38.000000000 +0100
+++ refind-0.11.2/debian/rules  2018-04-24 06:14:41.000000000 +0200
@@ -4,15 +4,19 @@
 
 DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU 2>/dev/null)
 ifeq (amd64, $(DEB_HOST_ARCH_CPU))
+       ARCH := x86_64
        EFI_ARCH := x64
 else
 ifeq (i386, $(DEB_HOST_ARCH_CPU))
+       ARCH := ia32
        EFI_ARCH := ia32
 else
 ifeq (arm64, $(DEB_HOST_ARCH_CPU))
+       ARCH = aarch64
        EFI_ARCH := aa64
 else
        $(warning EFI architecture for $(DEB_HOST_ARCH_CPU) is unknown)
+       ARCH := $(DEB_HOST_ARCH_CPU)
        EFI_ARCH := $(DEB_HOST_ARCH_CPU)
 endif
 endif
@@ -26,8 +30,8 @@
        rm -rf drivers_*/
 
 override_dh_auto_build:
-       $(MAKE) gnuefi
-       $(MAKE) fs_gnuefi
+       dh_auto_build -- gnuefi 'ARCH=$(ARCH)'
+       dh_auto_build -- fs_gnuefi 'ARCH=$(ARCH)'
 
 override_dh_auto_install:
        # "make install" actually runs "efi-install" for the current system, so 
let's not do that :)

Reply via email to