summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD6
2 files changed, 5 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5d22f344068c..7071fddc716e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -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
diff --git a/PKGBUILD b/PKGBUILD
index f4c7a29cd36f..c0edf63fadd0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -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