aboutsummaryrefslogtreecommitdiffstats
path: root/testing/openjdk8/APKBUILD
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2015-08-19 15:28:19 +0200
committerNatanael Copa <ncopa@alpinelinux.org>2015-08-20 08:27:20 +0200
commita15872ceb14f640a6ce16cd003db240cfb211978 (patch)
treeae4d6c499a35b81c2aa385518105c923da09e60f /testing/openjdk8/APKBUILD
parentd3500d40ee47cefda89adad75f9bf99be9fa3ce4 (diff)
downloadaports-a15872ceb14f640a6ce16cd003db240cfb211978.tar.gz
aports-a15872ceb14f640a6ce16cd003db240cfb211978.tar.bz2
aports-a15872ceb14f640a6ce16cd003db240cfb211978.tar.xz
testing/openjdk8: fix permissions and deps
we need have all deps/provides prefixed with 'openjdk8:' to avoid conflict with openjdk7
Diffstat (limited to 'testing/openjdk8/APKBUILD')
-rw-r--r--testing/openjdk8/APKBUILD10
1 files changed, 4 insertions, 6 deletions
diff --git a/testing/openjdk8/APKBUILD b/testing/openjdk8/APKBUILD
index f6a1b11b2d..d7400dbb9a 100644
--- a/testing/openjdk8/APKBUILD
+++ b/testing/openjdk8/APKBUILD
@@ -5,7 +5,7 @@ _java_ver=8
_jdk_update=66
_jdk_build=02
pkgver=$_java_ver.$_jdk_update.$_jdk_build
-pkgrel=0
+pkgrel=1
pkgdesc="Sun OpenJDK 8"
url="http://openjdk.java.net"
arch="x86_64 x86"
@@ -34,7 +34,7 @@ _jrelib="$INSTALL_BASE/jre/lib/$_jarch"
# exclude xawt from ldpath to avoid duplicate provides for libmawt.so
# (also in headless). in future this should be a virtual provides.
ldpath="$_jrelib:$_jrelib/native_threads:$_jrelib/headless:$_jrelib/server:$_jrelib/jli"
-somask="libjvm.so"
+sonameprefix="$pkgname:"
subpackages="$pkgname-jre-lib:jrelib $pkgname-jre $pkgname-jre-base:jrebase
$pkgname-doc:doc"
@@ -141,6 +141,8 @@ package() {
find "$pkgdir"/$INSTALL_BASE -iname "*.diz" -delete
find "$pkgdir"/$INSTALL_BASE -iname "*.debuginfo" -delete
+ find "$pkgdir"/$INSTALL_BASE -name "*.jar" \! -perm +006 \
+ | xargs chmod go+r
pax_mark_vm "$pkgdir"/$INSTALL_BASE
}
@@ -162,8 +164,6 @@ jrelib() {
jrebase() {
pkgdesc="OpenJDK 8 Java Runtime (no GUI support)"
depends="$pkgname-jre-lib java-common"
- # manually provide this to avoid clash with libgcj's libjvm.so
- provides="so:openjdk8:libjvm.so=0"
mkdir -p "$subpkgdir"/$INSTALL_BASE/bin
@@ -180,8 +180,6 @@ jrebase() {
jre() {
pkgdesc="OpenJDK 8 Java Runtime"
- # manually depend to avoid clash with libgcj's libjvm.so
- depends="so:openjdk8:libjvm.so=0"
mkdir -p "$subpkgdir"
for A in jre/bin/policytool \