diff options
| author | TBK <tbk@jjtc.eu> | 2020-02-27 04:24:56 +0100 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2020-02-28 09:39:41 +0200 |
| commit | 9ee68e1dc661e88c820945ada4a4b3d016c62b2b (patch) | |
| tree | 2dd3ae55280246d9389ca2cebc5617393a4a03f3 /community | |
| parent | 520d569d79816da5c988532589cf086306484bdc (diff) | |
| download | aports-9ee68e1dc661e88c820945ada4a4b3d016c62b2b.tar.bz2 aports-9ee68e1dc661e88c820945ada4a4b3d016c62b2b.tar.xz | |
community/java-gcj-compat: update gccpkgrel to match gcc6-java
* Updated _gccpkgrel to match the pkgrel of gcc6-java.
* Clarified license.
* Modernized.
Diffstat (limited to 'community')
| -rw-r--r-- | community/java-gcj-compat/APKBUILD | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/community/java-gcj-compat/APKBUILD b/community/java-gcj-compat/APKBUILD index 3652a1afd2..d432804deb 100644 --- a/community/java-gcj-compat/APKBUILD +++ b/community/java-gcj-compat/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Timo Teras <timo.teras@iki.fi> _gccver=6.4.0 -_gccpkgrel=10 +_gccpkgrel=11 pkgname=java-gcj-compat pkgver=$_gccver @@ -11,27 +11,23 @@ pkgrel=$(( $_mypkgrel + $_gccpkgrel )) pkgdesc="JDK like environment using GCJ" url="https://git.alpinelinux.org/aports.git" arch="all" -license="GPL" +license="GPL-2.0-or-later" depends="fastjar gcc6-java=$_gccver-r$_gccpkgrel java-common" makedepends="gcc6-java=$_gccver-r$_gccpkgrel zlib-dev paxmark" -source= - -builddir="$srcdir/$pkgname-$pkgver" prepare() { ( - gccver=`(. ../../community/gcc6/APKBUILD ; echo "$pkgver")` - gccpkgrel=`(. ../../community/gcc6/APKBUILD ; echo "$pkgrel")` + gccver=$(. ../../community/gcc6/APKBUILD ; echo "$pkgver") + gccpkgrel=$(. ../../community/gcc6/APKBUILD ; echo "$pkgrel") if [ "$gccver" != "$_gccver" ] || [ "$gccpkgrel" != "$_gccpkgrel" ]; then die "gcc6 version ($gccver) needs to match _gccver ($_gccver)" fi ) + mkdir -p $builddir } build() { - mkdir -p $builddir - cd $builddir gcj-6 -Wl,-Bsymbolic -findirect-dispatch -o ecj \ --main=org.eclipse.jdt.internal.compiler.batch.Main \ /usr/share/java/ecj.jar -lgcj @@ -68,7 +64,7 @@ package() { 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` + gcjrel=$(ls -d /usr/lib/gcj-$_gccver-* | cut -d '-' -f 3) mkdir -p $JRE_BIN_DIR $JRE_LIB_DIR/$CPU ln -sf ../../../../../bin/gij-6 $JRE_BIN_DIR/java |