diff options
author | Brian Bidulock | 2018-11-24 05:09:49 -0700 |
---|---|---|
committer | Brian Bidulock | 2018-11-24 05:09:49 -0700 |
commit | 5e6f4c8be70790bb687ac9f3ff20d35af09f52b1 (patch) | |
tree | dbb1f1965a17816770f3d1bfb62fd3e7ae1154cb | |
parent | 952c63a0875b46acc09ab91fae986a4bc8f302f4 (diff) | |
download | aur-5e6f4c8be70790bb687ac9f3ff20d35af09f52b1.tar.gz |
handle gcc6-gcj better
-rw-r--r-- | .SRCINFO | 8 | ||||
-rw-r--r-- | PKGBUILD | 15 |
2 files changed, 16 insertions, 7 deletions
@@ -1,14 +1,14 @@ pkgbase = gjdoc pkgdesc = GNU Classpath JavaDoc implementation pkgver = 0.7.9 - pkgrel = 5 + pkgrel = 10 url = http://savannah.gnu.org/projects/classpath/ - install = gjdoc.install arch = i686 arch = x86_64 license = GPL - depends = gcc-gcj>=5.1.0 - depends = java-environment + makedepends = fastjar + makedepends = patchelf + depends = gcc6-gcj=6.5.0 noextract = antlr-2.7.7.jar options = !libtool options = !buildflags @@ -2,15 +2,17 @@ pkgname=gjdoc pkgver=0.7.9 -pkgrel=5 +pkgrel=10 +_gcjver=6.5.0 pkgdesc="GNU Classpath JavaDoc implementation" arch=(i686 x86_64) license=('GPL') url="http://savannah.gnu.org/projects/classpath/" -depends=('gcc-gcj>=5.1.0' 'java-environment') +makedepends=('fastjar' 'patchelf') +depends=("gcc6-gcj=${_gcjver}") options=('!libtool' '!buildflags') noextract=('antlr-2.7.7.jar') -install=$pkgname.install +#install=$pkgname.install source=(http://ftp.gnu.org/gnu/classpath/${pkgname}-${pkgver}.tar.gz http://www.antlr2.org/download/antlr-2.7.7.jar) md5sums=('24cade2efe22d5adefcbabb21f094803' @@ -18,6 +20,8 @@ md5sums=('24cade2efe22d5adefcbabb21f094803' build() { cd $pkgname-$pkgver + export JAVA_HOME=/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0 + export CLASSPATH=${CLASSPATH:+$CLASSPATH:}$JAVA_HOME/lib ./configure --prefix=/usr --with-antlr-jar=${srcdir}/antlr-2.7.7.jar make || find . -type f -name '*.o' | while read f; do objcopy -L '_ZGr8_$_dummy' $f; done make || find . -type f -name '*.o' | while read f; do objcopy -L '_ZGr8_$_dummy' $f; done @@ -28,4 +32,9 @@ build() { package() { cd $pkgname-$pkgver make DESTDIR=${pkgdir} install + patchelf --set-rpath /usr/lib/gcc/x86_64-pc-linux-gnu/${_gcjver} \ + ${pkgdir}/usr/bin/gjdoc + install -dm755 ${pkgdir}${JAVA_HOME}/bin + ln -sf ../../../../bin/gjdoc ${pkgdir}${JAVA_HOME}/bin/gjdoc } + |