Source: u-boot Severity: serious Version: 2017.07+dfsg1-1 Tags: patch X-Debbugs-Cc: debian-...@lists.debian.org
Several armel targets FTBFS on armel: https://buildd.debian.org/status/fetch.php?pkg=u-boot&arch=armel&ver=2017.09%2Bdfsg1-2&stamp=1507251912&raw=0 The boot log fails on the first (dockstar), but I believe openrd*, sheevaplug and possibly guruplug and/or dreamplug are also affected. I've set the version to 2017.07+dfsg1-1, as it also FTBFS when rebuilding with gcc-7 on armel. Though this obviously doesn't seem like a good long-term solution, I've been able to work around the issue by patching u-boot to use gcc-6 only on armel, see patch below. live well, vagrant diff --git a/debian/control b/debian/control index d4116be54e..3393470c5e 100644 --- a/debian/control +++ b/debian/control @@ -8,6 +8,7 @@ Build-Depends: debhelper (>= 9.20141010), device-tree-compiler, dpkg-dev (>= 1.17.14), + gcc-6 [armel] <!cross>, gcc-6-arm-linux-gnueabi [armel] <cross>, libfdt-dev:native [arm64], libc6:arm64 [arm64] <cross>, libc6:armhf [armhf] <cross>, diff --git a/debian/patches/allow-setting-gcc b/debian/patches/allow-setting-gcc new file mode 100644 index 0000000000..a0ccd9ca18 --- /dev/null +++ b/debian/patches/allow-setting-gcc @@ -0,0 +1,13 @@ +Index: u-boot/Makefile +=================================================================== +--- u-boot.orig/Makefile ++++ u-boot/Makefile +@@ -338,7 +338,7 @@ LD = $(CROSS_COMPILE)ld.bfd + else + LD = $(CROSS_COMPILE)ld + endif +-CC = $(CROSS_COMPILE)gcc ++CC = $(CROSS_COMPILE)$(GCC) + CPP = $(CC) -E + AR = $(CROSS_COMPILE)ar + NM = $(CROSS_COMPILE)nm diff --git a/debian/patches/series b/debian/patches/series index 03cf73d313..65fb2b11d6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -32,3 +32,4 @@ odroid-xu3/877074-u-boot-exynos-Default-environment-for-Odr.patch upstream/rk3399/0003-rockchip-rk3399-spl-remove-hard-coded-addresses-for-.patch upstream/rk3399/0004-rockchip-clk-rk3399-add-clk_enable-function-and-supp.patch +allow-setting-gcc diff --git a/debian/rules b/debian/rules index 4fae806b0c..42b772a2c0 100755 --- a/debian/rules +++ b/debian/rules @@ -11,6 +11,11 @@ export CROSS_COMPILE ?= $(DEB_HOST_GNU_TYPE)- cross_build_tools ?= y endif +export GCC = gcc +ifeq ($(DEB_HOST_ARCH),armel) +export GCC = gcc-6 +endif + # support parallel build using DEB_BUILD_OPTIONS=parallel=N ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) DEB_UBOOT_FLAGS += -j$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
signature.asc
Description: PGP signature
