diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2018-12-14 14:41:30 +0000 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2018-12-14 14:41:30 +0000 |
| commit | 7880cba7b90801db958015f801f09af67160f56e (patch) | |
| tree | 6d34bf8da842ba2b629268eaf2e0b29d175e60f3 /community | |
| parent | 37cee9ea529fa1b0c8ada5aac07ef8039087c014 (diff) | |
| download | aports-7880cba7b90801db958015f801f09af67160f56e.tar.bz2 aports-7880cba7b90801db958015f801f09af67160f56e.tar.xz | |
community/java-gcj-compat: fix tools.jar installation path
Diffstat (limited to 'community')
| -rw-r--r-- | community/java-gcj-compat/APKBUILD | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/community/java-gcj-compat/APKBUILD b/community/java-gcj-compat/APKBUILD index d9d26a0832..65db32a9d5 100644 --- a/community/java-gcj-compat/APKBUILD +++ b/community/java-gcj-compat/APKBUILD @@ -6,7 +6,7 @@ _gccpkgrel=7 pkgname=java-gcj-compat pkgver=$_gccver -_mypkgrel=4 +_mypkgrel=5 pkgrel=$(( $_mypkgrel + $_gccpkgrel )) pkgdesc="JDK like environment using GCJ" url="https://git.alpinelinux.org/aports.git" @@ -46,13 +46,14 @@ package() { JVM_DIR=$pkgdir/usr/lib/jvm JDK_DIR=$JVM_DIR/java-1.5-gcj JDK_BIN_DIR=$JDK_DIR/bin + JDK_LIB_DIR=$JDK_DIR/lib JRE_DIR=$JDK_DIR/jre JRE_BIN_DIR=$JRE_DIR/bin JRE_LIB_DIR=$JRE_DIR/lib CPU=$(uname -m | sed -e 's/i.86/i386/g' -e 's/x86_64/amd64/g') - mkdir -p $JDK_BIN_DIR + mkdir -p $JDK_BIN_DIR $JDK_LIB_DIR ln -sf ../../../../bin/gij-6 $JDK_BIN_DIR/java ln -sf ../../../../bin/fastjar $JDK_BIN_DIR/fastjar ln -sf ../../../../bin/sinjdoc $JDK_BIN_DIR/javadoc @@ -65,6 +66,7 @@ package() { ln -sf ../../../../bin/gkeytool-6 $JDK_BIN_DIR/keytool ln -sf ../../../../bin/gjar-6 $JDK_BIN_DIR/gjar ln -sf ../../../../bin/gnative2ascii-6 $JDK_BIN_DIR/gnative2ascii + ln -sf ../../../../share/java/libgcj-tools-$_gccver.jar $JDK_LIB_DIR/tools.jar gcjrel=`ls -d /usr/lib/gcj-$_gccver-* | cut -d '-' -f 3` @@ -73,7 +75,6 @@ package() { ln -sf ../../../../../bin/grmiregistry-6 $JRE_BIN_DIR/rmiregistry ln -sf ../../../../../bin/gkeytool-6 $JRE_BIN_DIR/keytool ln -sf ../../../../../share/java/libgcj-$_gccver.jar $JRE_LIB_DIR/rt.jar - ln -sf ../../../../../share/java/libgcj-tools-$_gccver.jar $JRE_LIB_DIR/tools.jar ln -sf ../../../../../../lib/gcj-$_gccver-$gcjrel/libjvm.so $JRE_LIB_DIR/$CPU ln -sf ../../../../../../lib/gcj-$_gccver-$gcjrel/libjavamath.so $JRE_LIB_DIR/$CPU ln -sf ../../../../../../lib/gcj-$_gccver-$gcjrel/classmap.db $JRE_LIB_DIR/$CPU |