aboutsummaryrefslogtreecommitdiffstats
path: root/main/openjdk6
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2012-10-11 07:54:45 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2012-10-11 07:54:45 +0000
commit0b9e4e927c99ce9162c1556228db320115e14156 (patch)
tree6cf7862c4da614e4dd45c770e0a7eab3c8535a6a /main/openjdk6
parent979d6a151a6a36868e0ba63d90237ad55c465053 (diff)
downloadaports-0b9e4e927c99ce9162c1556228db320115e14156.tar.bz2
aports-0b9e4e927c99ce9162c1556228db320115e14156.tar.xz
main/openjdk6: rebuild with somask to avoid conflict with libgcj
both libgcj and openjdk6-jre-base provided so:libjvm.so so we mask this so and deal with it manually
Diffstat (limited to 'main/openjdk6')
-rw-r--r--main/openjdk6/APKBUILD9
1 files changed, 7 insertions, 2 deletions
diff --git a/main/openjdk6/APKBUILD b/main/openjdk6/APKBUILD
index 3b5647a124..73f6936800 100644
--- a/main/openjdk6/APKBUILD
+++ b/main/openjdk6/APKBUILD
@@ -3,7 +3,7 @@
pkgname=openjdk6
pkgver=1.6.0_p24
icedteaver=1.11.4
-pkgrel=4
+pkgrel=5
pkgdesc="Sun OpenJDK 6 via IcedTea"
url="http://icedtea.classpath.org/"
arch="x86 x86_64"
@@ -28,6 +28,8 @@ _jrelib="/usr/lib/jvm/java-1.6-openjdk/jre/lib/$_arch"
# infuture this should be a virtual provides
ldpath="$_jrelib:$_jrelib/native_threads:$_jrelib/headless:$_jrelib/server:$_jrelib/jli"
+somask="libjvm.so"
+
subpackages="$pkgname-jre-lib:jrelib $pkgname-jre $pkgname-jre-base:jrebase
$pkgname-doc:doc"
BOOTSTRAP_JAVA_HOME=/usr/lib/jvm/java-1.5-gcj/
@@ -142,6 +144,8 @@ jrelib() {
jrebase() {
pkgdesc="OpenJDK 6 Java Runtime (no GUI support)"
depends="$pkgname-jre-lib java-common"
+ # manually provide this to avoid clash with libgcj's libjvm.so
+ provides="so:openjdk6:libjvm.so=0"
mkdir -p "$subpkgdir"/$INSTALL_BASE/bin
@@ -162,7 +166,8 @@ jrebase() {
jre() {
pkgdesc="OpenJDK 6 Java Runtime"
- depends=""
+ # manually depend to avoid clash with libgcj's libjvm.so
+ depends="so:openjdk6:libjvm.so=0"
mkdir -p "$subpkgdir"
for A in jre/bin/policytool \