aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
Diffstat (limited to 'main')
-rw-r--r--main/openjdk6/APKBUILD17
1 files changed, 14 insertions, 3 deletions
diff --git a/main/openjdk6/APKBUILD b/main/openjdk6/APKBUILD
index 8621e0c298..2478a1286e 100644
--- a/main/openjdk6/APKBUILD
+++ b/main/openjdk6/APKBUILD
@@ -3,10 +3,10 @@
pkgname=openjdk6
pkgver=1.6.0_p24
icedteaver=1.11.4
-pkgrel=3
+pkgrel=4
pkgdesc="Sun OpenJDK 6 via IcedTea"
url="http://icedtea.classpath.org/"
-arch="all"
+arch="x86 x86_64"
license="GPL-2 with Classpath"
depends="$pkgname-jre"
makedepends="java-gcj-compat findutils tar zip paxctl gawk pkgconfig util-linux-ng
@@ -15,7 +15,18 @@ makedepends="java-gcj-compat findutils tar zip paxctl gawk pkgconfig util-linux-
libxrender-dev alsa-lib-dev freetype-dev xulrunner-dev
gtk+2.0-dev ca-certificates libxslt zip"
install=""
-options="ldpath-recursive"
+
+case $CARCH in
+x86) _arch=i386;;
+x86_64) _arch=amd64;;
+esac
+
+_jrelib="/usr/lib/jvm/java-1.6-openjdk/jre/lib/$_arch"
+# exclude xawt from ldpath to avoid duplicate provides for libmawt.so (also in
+# headless).
+# infuture this should be a virtual provides
+ldpath="$_jrelib:$_jrelib/native_threads:$_jrelib/headless:$_jrelib/server:$_jrelib/jli"
+
subpackages="$pkgname-jre-lib:jrelib $pkgname-jre $pkgname-jre-base:jrebase
$pkgname-doc:doc"
BOOTSTRAP_JAVA_HOME=/usr/lib/jvm/java-1.5-gcj/