From 46371f042df89ce0e38733bdad3d9e8fee324a37 Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net>
Date: Thu, 20 Feb 2020 00:09:46 +0100
Subject: [PATCH] main/devicepkg-dev: make HOSTCC optional (!1007)

HOSTCC defaults to gcc, so we should only set it to override it
if we want to use an older GCC. Removing it avoids annoying linter
warnings caused by the HOSTCC="..." variable assignments.
---
 main/devicepkg-dev/APKBUILD                    |  4 ++--
 main/devicepkg-dev/downstreamkernel_prepare.sh | 10 +++++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/main/devicepkg-dev/APKBUILD b/main/devicepkg-dev/APKBUILD
index 1f718b202..906afa5f7 100644
--- a/main/devicepkg-dev/APKBUILD
+++ b/main/devicepkg-dev/APKBUILD
@@ -1,5 +1,5 @@
 pkgname="devicepkg-dev"
-pkgver=0.11.0
+pkgver=0.11.1
 pkgrel=0
 pkgdesc="Provides default device package functions"
 url="https://postmarketos.org"
@@ -63,7 +63,7 @@ package() {
 sha512sums="d69930dd790b00fb39760a37d95a10899f0d167e10e2804feb05d9ce04f94185dc32d36edc90214aba2ea2aa09bf18f7dab93f1d2eff23f67beb2cc83be30e7c  compiler-gcc.h
 332f693abfb3260ad6c1ef5d245062af8cc8eedba7db360d54db5a7fcf7b301a37a299a0004e9ff4de80b5dfcd260d0cd0f99f96ed6d56080bb4dea81116cc82  devicepkg_build.sh
 5ac4a5087c598582cb12278a4ce0c2dccfe7f91c1620d3328d1d0944c89eff81f8afcc681506d73a80d69615401f96a99fb1fdaa755fea101e0d36ec6ef2d5d0  devicepkg_package.sh
-1b038d0bca1e130674497cf7aeb26fac2bcec510ce094fa6f6700fcdcabc778741541c1aa89d3588ed42908f60708a2d9b83ffd5e50e99db619d366458e82256  downstreamkernel_prepare.sh
+69dad4bde05377ec235d72789c80cdfbdaa5a19b97defe9d4c19e0e12aa2c081d6dcf19fb80ebe33c2d6539ce8a39d36d98413404852d6bb2d56cc75d2f1ee95  downstreamkernel_prepare.sh
 c912156a257ad55d1d72e8e50e1f0e9620497d0ffbb8cba332d2510644b6aeb8c50b9b3cf3f43316a086ab81c3a7c2e6f54aaa4d825b8af811d84c4e5cc520d9  downstreamkernel_package.sh
 cf5ee240cd1c1e9d30cdec833b4a007fd2e00f9a32ba3f265f99aa2e3dd3601cf43c08d3f3e01bade1d5b2648a6754b2f236e5cb4a9945e18e5c4e97aa2ed7c8  devicepkg_subpackage_kernel.sh
 9bb7f2a0930f397a713e9f4b6d5b83a426d9a2a3f692dcc42ac30717bf26ead869d8823a38f3ad388af12b2b9a02e8ec4d4418e9c2062389ed06d2b891a49ff3  deviceinfo
diff --git a/main/devicepkg-dev/downstreamkernel_prepare.sh b/main/devicepkg-dev/downstreamkernel_prepare.sh
index f1c36290a..30d51205a 100644
--- a/main/devicepkg-dev/downstreamkernel_prepare.sh
+++ b/main/devicepkg-dev/downstreamkernel_prepare.sh
@@ -29,13 +29,16 @@ _carch=$4
 HOSTCC=$5
 
 if [ -z "$srcdir" ] || [ -z "$builddir" ] || [ -z "$_config" ] ||
-	[ -z "$_carch" ] || [ -z "$HOSTCC" ]; then
+	[ -z "$_carch" ]; then
 	echo "ERROR: missing argument!"
 	echo "Please call downstreamkernel_prepare() with \$srcdir, \$builddir,"
-	echo "\$_config, \$_carch and \$HOSTCC as arguments."
+	echo "\$_config, \$_carch (and optionally \$HOSTCC) as arguments."
 	exit 1
 fi
 
+# Only override HOSTCC if set (to force use of an old gcc)
+[ -z "$HOSTCC" ] || HOSTCC="HOSTCC=$HOSTCC"
+
 # Support newer GCC versions
 install_gcc_h
 
@@ -50,4 +53,5 @@ done
 
 # Prepare kernel config ('yes ""' for kernels lacking olddefconfig)
 cp "$srcdir/$_config" "$builddir"/.config
-yes "" | make -C "$builddir" ARCH="$_carch" HOSTCC="$HOSTCC" oldconfig
+# shellcheck disable=SC2086
+yes "" | make -C "$builddir" ARCH="$_carch" $HOSTCC oldconfig