diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2012-09-20 08:41:30 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2012-09-20 08:46:42 +0000 |
| commit | 5d769d1b8474783879c2bb80a3035c17a344c490 (patch) | |
| tree | 9c14bc412ff3c3c114842c2922e89bf82e1e21da /main | |
| parent | c52779733b7ab62300895565013940ded4ec338a (diff) | |
| download | aports-5d769d1b8474783879c2bb80a3035c17a344c490.tar.bz2 aports-5d769d1b8474783879c2bb80a3035c17a344c490.tar.xz | |
main/openjdk6: another try to get the provides correct
exclude xawt lib from ldpath search. This is so we avoid duplicate
provides for headless/libmawt.so and xawt/libmawt.so
libmawt should really be a virtual provides but that depends on an
apk info --who-provides feature.
Diffstat (limited to 'main')
| -rw-r--r-- | main/openjdk6/APKBUILD | 17 |
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/ |