From a9332d0ef38689f415b221acd2a282b5ff53c070 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
Date: Fri, 28 Apr 2017 20:43:44 +0000
Subject: main/java-gcj-compat: build ecj as no-pie for now

seems boehm-gc does not like pie applications
---
 main/java-gcj-compat/APKBUILD | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

(limited to 'main')

diff --git a/main/java-gcj-compat/APKBUILD b/main/java-gcj-compat/APKBUILD
index 5c776c36ca..54f9a3aa9d 100644
--- a/main/java-gcj-compat/APKBUILD
+++ b/main/java-gcj-compat/APKBUILD
@@ -6,7 +6,7 @@ gccpkgrel=`(. ../../main/gcc/APKBUILD ; echo "$pkgrel")`
 
 pkgname=java-gcj-compat
 pkgver=$gccver
-_mypkgrel=1
+_mypkgrel=2
 pkgrel=$(( $_mypkgrel + $gccpkgrel ))
 pkgdesc="JDK like environment using GCJ"
 url="http://git.alpinelinux.org/aports.git"
@@ -18,16 +18,19 @@ install=""
 subpackages=""
 source=""
 
-_builddir="$srcdir/$pkgname-$pkgver"
+builddir="$srcdir/$pkgname-$pkgver"
 
 build() {
-	mkdir -p $_builddir
-	cd $_builddir
-	gcj -Wl,-Bsymbolic -findirect-dispatch -o ecj \
+	mkdir -p $builddir
+	cd $builddir
+	gcj -no-pie -Wl,-Bsymbolic -findirect-dispatch -o ecj \
 		--main=org.eclipse.jdt.internal.compiler.batch.Main \
-		/usr/share/java/ecj.jar -lgcj \
-		|| return 1
-	paxmark -msp ecj || return 1
+		/usr/share/java/ecj.jar -lgcj
+	paxmark -msp ecj
+}
+
+check() {
+	$builddir/ecj > /dev/null
 }
 
 package() {
@@ -46,7 +49,7 @@ package() {
 	ln -sf ../../../../bin/sinjdoc $JDK_BIN_DIR/javadoc
 	ln -sf ../../../../bin/grmic $JDK_BIN_DIR/rmic
 	ln -sf ../../../../bin/gjavah $JDK_BIN_DIR/javah
-	install -s $_builddir/ecj $JDK_BIN_DIR/javac
+	install -s $builddir/ecj $JDK_BIN_DIR/javac
 	ln -sf ../../../../bin/gappletviewer $JDK_BIN_DIR/appletviewer
 	ln -sf ../../../../bin/gjarsigner $JDK_BIN_DIR/jarsigner
 	ln -sf ../../../../bin/grmiregistry $JDK_BIN_DIR/rmiregistry
-- 
cgit v1.2.3