aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorWilliam Pitcock <nenolod@dereferenced.org>2017-01-24 20:47:41 +0000
committerWilliam Pitcock <nenolod@dereferenced.org>2017-01-24 20:47:41 +0000
commit4e3c15461723fcafa7bca08c3a0dafa11e7954e1 (patch)
treea577ff730c7c463bdd0c00a5decaf5a4131ad7d0 /main
parent908ebc1a81f85c0c16a8d1aeed82c809d686ea0a (diff)
downloadaports-4e3c15461723fcafa7bca08c3a0dafa11e7954e1.tar.bz2
aports-4e3c15461723fcafa7bca08c3a0dafa11e7954e1.tar.xz
Revert "main/gcc: disable all paxmark calls when cross-building"
Diffstat (limited to 'main')
-rw-r--r--main/gcc/APKBUILD10
1 files changed, 6 insertions, 4 deletions
diff --git a/main/gcc/APKBUILD b/main/gcc/APKBUILD
index 5c22fe765d..a2f7444a3e 100644
--- a/main/gcc/APKBUILD
+++ b/main/gcc/APKBUILD
@@ -370,7 +370,9 @@ package() {
"$pkgdir"/usr/share/gdb/python/auto-load/usr/lib/
# only paxmark if cross-compiling, otherwise paxctl fails
- [ "$CBUILD" = "$CTARGET" ] && (paxmark -pmrs "$pkgdir"/$_gcclibexec/cc1 || return 1)
+ if [ "$CBUILD" = "$CTARGET" ]; then
+ paxmark -pmrs "$pkgdir"/$_gcclibexec/cc1 || return 1
+ fi
# move ada runtime libs
if $LANG_ADA; then
@@ -427,7 +429,7 @@ gpp() {
"$subpkgdir"/usr/${_cross:+$CTARGET/}lib \
mv "$pkgdir/$_gcclibexec/cc1plus" "$subpkgdir/$_gcclibexec/"
- [ "$CBUILD" = "$CTARGET" ] && (paxmark -pmrs "$subpkgdir/$_gcclibexec/cc1plus" || return 1)
+ paxmark -pmrs "$subpkgdir/$_gcclibexec/cc1plus" || return 1
mv "$pkgdir"/usr/${_cross:+$CTARGET/}lib/*++* "$subpkgdir"/usr/${_cross:+$CTARGET/}lib/ || return 1
mv "$pkgdir"/usr/${_cross:+$CTARGET/}include/c++ "$subpkgdir"/usr/${_cross:+$CTARGET/}include/ || return 1
@@ -478,7 +480,7 @@ java() {
pkgdesc="Java support for GCC"
depends="zlib-dev gcc=$_gccrel libgcj=$_gccrel"
- [ "$CBUILD" = "$CTARGET" ] && (paxmark -pm "$pkgdir"/$_gcclibexec/ecj1 || return 1)
+ paxmark -pm "$pkgdir"/$_gcclibexec/ecj1 || return 1
mkdir -p "$subpkgdir"/usr/bin "$subpkgdir"/usr/lib "$subpkgdir"/$_gcclibdir/
cd "$pkgdir"/usr/bin
mv gcj gcj-dbtool gjavah gcjh jcf-dump "$subpkgdir"/usr/bin/
@@ -504,7 +506,7 @@ libgcj() {
mkdir -p "$subpkgdir"/usr/bin
cd "$pkgdir"/usr/bin
- [ "$CBUILD" = "$CTARGET" ] && (paxmark -pmse "$pkgdir"/usr/bin/gij || return 1)
+ paxmark -pmse "$pkgdir"/usr/bin/gij || return 1
mv aot-compile gappletviewer gc-analyze gij gjar gjarsigner gkeytool\
gnative2ascii gorbd grmic grmid grmiregistry gserialver \
gtnameserv jv-convert rebuild-gcj-db \