aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2016-11-24 16:11:28 +0200
committerTimo Teräs <timo.teras@iki.fi>2016-11-24 16:11:28 +0200
commit0874f38f9cb6221484173e62fb8ff5f88d63043a (patch)
tree47c322a05ef0b3f5daa43a8ad87c1a975cb52d65
parent152f7de5c7993b1e01488c99877127162e2294a8 (diff)
downloadaports-0874f38f9cb6221484173e62fb8ff5f88d63043a.tar.bz2
aports-0874f38f9cb6221484173e62fb8ff5f88d63043a.tar.xz
main/linux-grsec: fix -fno-pie location
KCFLAGS is too late for gcc flags detection logic. So embed the -fno-pie flag directly to CC. This fixes the error: Cannot use CONFIG_CC_STACKPROTECTOR_STRONG: -fstack-protector-strong not supported by compiler
-rw-r--r--main/linux-grsec/APKBUILD7
1 files changed, 2 insertions, 5 deletions
diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD
index 9e7297d212..b499ea3a88 100644
--- a/main/linux-grsec/APKBUILD
+++ b/main/linux-grsec/APKBUILD
@@ -7,7 +7,7 @@ case $pkgver in
*.*.*) _kernver=${pkgver%.*};;
*.*) _kernver=${pkgver};;
esac
-pkgrel=1
+pkgrel=2
pkgdesc="Linux kernel with grsecurity"
url=http://grsecurity.net
depends="mkinitfs"
@@ -95,12 +95,10 @@ prepare() {
}
build() {
- export GCC_SPECS=hardenednopie.specs
for i in $_flavors; do
cd "$srcdir"/build-$i
- make CC="${CC:-gcc}" \
+ make CC="${CC:-gcc} -fno-pie" \
KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" \
- KCFLAGS="-fno-pie" \
|| return 1
done
}
@@ -174,7 +172,6 @@ _dev() {
echo "-$pkgrel-$_flavor" > "$dir"/localversion-alpine \
|| return 1
make -j1 -C "$srcdir"/linux-$_kernver O="$dir" HOSTCC="${CC:-gcc}" \
- KCFLAGS="-fno-pie" \
silentoldconfig prepare modules_prepare scripts
# remove the stuff that poits to real sources. we want 3rd party