diff options
| -rw-r--r-- | main/gcc/APKBUILD | 12 | ||||
| -rw-r--r-- | main/java-gcj-compat/APKBUILD | 9 |
2 files changed, 11 insertions, 10 deletions
diff --git a/main/gcc/APKBUILD b/main/gcc/APKBUILD index e1874a90ae..a23e5d72a0 100644 --- a/main/gcc/APKBUILD +++ b/main/gcc/APKBUILD @@ -8,14 +8,14 @@ _cross="" && _cross="-$CTARGET" pkgname="$pkgname$_cross" -pkgrel=4 +pkgrel=5 pkgdesc="The GNU Compiler Collection" url="http://gcc.gnu.org" arch="all" license="GPL LGPL" _gccrel=$pkgver-r$pkgrel depends="binutils$_cross" -makedepends_build="paxctl bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev cloog-dev" +makedepends_build="paxmark bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev cloog-dev" makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev zlib-dev cloog-dev !gettext-dev" makedepends="$makedepends_build $makedepends_host" subpackages=" " @@ -381,7 +381,7 @@ package() { mv "$pkgdir"/usr/lib/*-gdb.py \ "$pkgdir"/usr/share/gdb/python/auto-load/usr/lib/ - paxctl -c -pmrs "$pkgdir"/$_gcclibexec/cc1 || return 1 + paxmark -pmrs "$pkgdir"/$_gcclibexec/cc1 || return 1 # move ada runtime libs if $LANG_ADA; then @@ -430,7 +430,7 @@ gpp() { "$subpkgdir"/usr/lib \ mv "$pkgdir/$_gcclibexec/cc1plus" "$subpkgdir/$_gcclibexec/" - paxctl -c -pmrs "$subpkgdir/$_gcclibexec/cc1plus" || return 1 + paxmark -pmrs "$subpkgdir/$_gcclibexec/cc1plus" || return 1 mv "$pkgdir"/usr/lib/*++* "$subpkgdir"/usr/lib/ mv "$pkgdir"/usr/include/c++ "$subpkgdir"/usr/include/ @@ -484,7 +484,7 @@ java() { pkgdesc="Java support for GCC" depends="zlib-dev gcc=$_gccrel libgcj=$_gccrel" - paxctl -c -pm "$pkgdir"/$_gcclibexec/ecj1 || return 1 + paxmark -pm "$pkgdir"/$_gcclibexec/ecj1 || return 1 mkdir -p "$subpkgdir"/usr/bin "$subpkgdir"/usr/lib cd "$pkgdir"/usr/bin mv gcj gcj-dbtool gjavah gcjh jcf-dump "$subpkgdir"/usr/bin/ @@ -513,7 +513,7 @@ libgcj() { mkdir -p "$subpkgdir"/usr/bin cd "$pkgdir"/usr/bin - paxctl -c -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 \ diff --git a/main/java-gcj-compat/APKBUILD b/main/java-gcj-compat/APKBUILD index 432a165855..5c776c36ca 100644 --- a/main/java-gcj-compat/APKBUILD +++ b/main/java-gcj-compat/APKBUILD @@ -6,14 +6,14 @@ gccpkgrel=`(. ../../main/gcc/APKBUILD ; echo "$pkgrel")` pkgname=java-gcj-compat pkgver=$gccver -_mypkgrel=0 +_mypkgrel=1 pkgrel=$(( $_mypkgrel + $gccpkgrel )) pkgdesc="JDK like environment using GCJ" url="http://git.alpinelinux.org/aports.git" arch="all" license="GPL" depends="fastjar gcc-java=$gccver-r$gccpkgrel java-common" -makedepends="gcc-java=$gccver-r$gccpkgrel zlib-dev paxctl" +makedepends="gcc-java=$gccver-r$gccpkgrel zlib-dev paxmark" install="" subpackages="" source="" @@ -25,8 +25,9 @@ build() { cd $_builddir gcj -Wl,-Bsymbolic -findirect-dispatch -o ecj \ --main=org.eclipse.jdt.internal.compiler.batch.Main \ - /usr/share/java/ecj.jar -lgcj - paxctl -c -msp ecj + /usr/share/java/ecj.jar -lgcj \ + || return 1 + paxmark -msp ecj || return 1 } package() { |