diff options
author | Brian Bidulock | 2020-01-01 16:56:21 -0700 |
---|---|---|
committer | Brian Bidulock | 2020-01-01 16:56:21 -0700 |
commit | d007358bd5e277eddc03e702bd9776eec0a4ac81 (patch) | |
tree | 7ab0d8438ff4ecc8de77a63e3dd226a9fa9e907b | |
parent | 5e6f4c8be70790bb687ac9f3ff20d35af09f52b1 (diff) | |
download | aur-d007358bd5e277eddc03e702bd9776eec0a4ac81.tar.gz |
correct i686 rpath
-rw-r--r-- | .SRCINFO | 2 | ||||
-rw-r--r-- | PKGBUILD | 6 |
2 files changed, 5 insertions, 3 deletions
@@ -1,7 +1,7 @@ pkgbase = gjdoc pkgdesc = GNU Classpath JavaDoc implementation pkgver = 0.7.9 - pkgrel = 10 + pkgrel = 11 url = http://savannah.gnu.org/projects/classpath/ arch = i686 arch = x86_64 @@ -2,7 +2,7 @@ pkgname=gjdoc pkgver=0.7.9 -pkgrel=10 +pkgrel=11 _gcjver=6.5.0 pkgdesc="GNU Classpath JavaDoc implementation" arch=(i686 x86_64) @@ -23,6 +23,8 @@ build() { 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 + # Fight unused direct deps + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool 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 make || find . -type f -name '*.o' | while read f; do objcopy -L '_ZGr8_$_dummy' $f; done @@ -32,7 +34,7 @@ build() { package() { cd $pkgname-$pkgver make DESTDIR=${pkgdir} install - patchelf --set-rpath /usr/lib/gcc/x86_64-pc-linux-gnu/${_gcjver} \ + patchelf --set-rpath /usr/lib/gcc/${CARCH}-pc-linux-gnu/${_gcjver} \ ${pkgdir}/usr/bin/gjdoc install -dm755 ${pkgdir}${JAVA_HOME}/bin ln -sf ../../../../bin/gjdoc ${pkgdir}${JAVA_HOME}/bin/gjdoc |