From b43b047ceb3a360a77bb43bdf9a0815874d73859 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Thu, 6 Feb 2020 19:37:08 +0100 Subject: main/linux-*: remove redundant override of HOSTCC apkbuild-lint complains about the use of HOSTCC in APKBUILDs: IC:[AL6]:main/linux-lts/APKBUILD:66:prefix custom variable with _: HOSTCC="${CC:-gcc}" IC:[AL6]:main/linux-lts/APKBUILD:67:prefix custom variable with _: HOSTCC="${HOSTCC#${CROSS_COMPILE}}" MC:[AL31]:main/linux-lts/APKBUILD:66:variables must not have capital letters MC:[AL31]:main/linux-lts/APKBUILD:67:variables must not have capital letters The first two were fixed in https://gitlab.alpinelinux.org/Leo/atools/merge_requests/24. But apkbuild-lint still complains about the capitalized variable. Adding an exception for this in atools seems quite complicated. It turns out overriding HOSTCC in the linux-* APKBUILD is actually no longer necessary. abuild automatically sets HOSTCC correctly now when cross compiling, and the APKBUILD will just set the same value again. (see https://gitlab.alpinelinux.org/alpine/abuild/commit/9be173c6774fbec6cf8acd573faa039dd4129fc6) We can just remove HOSTCC from the APKBUILD. linux-lts still builds fine when cross compiling for aarch64 using bootstrap.sh. --- main/linux-rpi/APKBUILD | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'main/linux-rpi/APKBUILD') diff --git a/main/linux-rpi/APKBUILD b/main/linux-rpi/APKBUILD index 80ecdfdc20..e60cf12ebe 100644 --- a/main/linux-rpi/APKBUILD +++ b/main/linux-rpi/APKBUILD @@ -52,9 +52,6 @@ case "$CARCH" in arm*) _carch="arm" ;; esac -HOSTCC="${CC:-gcc}" -HOSTCC="${HOSTCC#${CROSS_COMPILE}}" - prepare() { local _patch_failed= cd "$srcdir"/linux-$_kernver @@ -94,7 +91,6 @@ prepare() { make -C "$srcdir"/linux-$_kernver \ O="$builddir" \ ARCH="$_carch" \ - HOSTCC="$HOSTCC" \ olddefconfig _verifyconfig $flavor done @@ -271,7 +267,7 @@ _dev() { # external modules, and create the scripts mkdir -p "$dir" cp "$srcdir"/build-$_flavor/.config "$dir"/.config - make -j1 -C "$srcdir"/linux-$_kernver O="$dir" HOSTCC="${CC:-gcc}" \ + make -j1 -C "$srcdir"/linux-$_kernver O="$dir" \ syncconfig prepare modules_prepare scripts # remove the stuff that points to real sources. we want 3rd party -- cgit v1.2.3