diff options
| author | Minecrell <minecrell@minecrell.net> | 2020-02-06 19:37:08 +0100 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2020-02-17 16:49:22 +0200 |
| commit | b43b047ceb3a360a77bb43bdf9a0815874d73859 (patch) | |
| tree | a3e22e3f030b947b691bc1e017c81694672bb14e | |
| parent | 40a1b233c1c26aaa13e88de4a1ebc7715ddc7994 (diff) | |
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.
| -rw-r--r-- | main/linux-lts/APKBUILD | 7 | ||||
| -rw-r--r-- | main/linux-octeon/APKBUILD | 7 | ||||
| -rw-r--r-- | main/linux-rpi/APKBUILD | 6 |
3 files changed, 5 insertions, 15 deletions
diff --git a/main/linux-lts/APKBUILD b/main/linux-lts/APKBUILD index 8dbcf3c6864..bb03dd19c25 100644 --- a/main/linux-lts/APKBUILD +++ b/main/linux-lts/APKBUILD @@ -63,9 +63,6 @@ ppc*) _carch="powerpc" ;; s390*) _carch="s390" ;; esac -HOSTCC="${CC:-gcc}" -HOSTCC="${HOSTCC#${CROSS_COMPILE}}" - prepare() { local _patch_failed= cd "$srcdir"/linux-$_kernver @@ -109,7 +106,7 @@ oldconfig() { cp "$srcdir"/$_config "$_builddir"/.config make -C "$srcdir"/linux-$_kernver \ O="$_builddir" \ - ARCH="$_carch" HOSTCC="$HOSTCC" \ + ARCH="$_carch" \ listnewconfig oldconfig done } @@ -191,7 +188,7 @@ _dev() { cp "$srcdir"/config-$_flavor.${CARCH} "$dir"/.config echo "-$pkgrel-$_flavor" > "$dir"/localversion-alpine - make -j1 -C "$srcdir"/linux-$_kernver O="$dir" ARCH="$_carch" HOSTCC="$HOSTCC" \ + make -j1 -C "$srcdir"/linux-$_kernver O="$dir" ARCH="$_carch" \ syncconfig prepare modules_prepare scripts # remove the stuff that points to real sources. we want 3rd party diff --git a/main/linux-octeon/APKBUILD b/main/linux-octeon/APKBUILD index ee861595d85..823bedd829c 100644 --- a/main/linux-octeon/APKBUILD +++ b/main/linux-octeon/APKBUILD @@ -55,9 +55,6 @@ ppc*) _carch="powerpc" ;; s390*) _carch="s390" ;; esac -HOSTCC="${CC:-gcc}" -HOSTCC="${HOSTCC#${CROSS_COMPILE}}" - prepare() { local _patch_failed= cd "$srcdir"/linux-$_kernver @@ -101,7 +98,7 @@ oldconfig() { cp "$srcdir"/$_config "$_builddir"/.config make -C "$srcdir"/linux-$_kernver \ O="$_builddir" \ - ARCH="$_carch" HOSTCC="$HOSTCC" \ + ARCH="$_carch" \ listnewconfig oldconfig done } @@ -181,7 +178,7 @@ _dev() { cp "$srcdir"/config-$_flavor.${CARCH} "$dir"/.config echo "-$pkgrel-$_flavor" > "$dir"/localversion-alpine - make -j1 -C "$srcdir"/linux-$_kernver O="$dir" ARCH="$_carch" HOSTCC="$HOSTCC" \ + make -j1 -C "$srcdir"/linux-$_kernver O="$dir" ARCH="$_carch" \ syncconfig prepare modules_prepare scripts # remove the stuff that points to real sources. we want 3rd party diff --git a/main/linux-rpi/APKBUILD b/main/linux-rpi/APKBUILD index 80ecdfdc20c..e60cf12ebec 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 |