summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmil Lundberg2015-09-02 14:30:48 +0200
committerEmil Lundberg2015-09-18 17:15:11 +0200
commit905bd974f38a947de9b73d43c0f7f7bb37f14a37 (patch)
tree8a65a38bdf0a9765c96f14e807b0d867d472beaf
parent06204caa866aa748473a4b8180128a06dd04fe07 (diff)
downloadaur-905bd974f38a947de9b73d43c0f7f7bb37f14a37.tar.gz
Use /usr/lib32/jvm instead of /usr/lib/jvm
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD9
2 files changed, 7 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 95e8966af9d..47772b3c508 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -11,8 +11,10 @@ pkgbase = icedtea-web
makedepends = npapi-sdk
makedepends = rhino
makedepends = junit
+ makedepends = bin32-jdk
makedepends = firefox
makedepends = epiphany
+ depends = bin32-jre
optdepends = rhino: for using proxy auto config files
noextract = icedtea-web-1.6.tar.gz
source = http://icedtea.classpath.org/download/source/icedtea-web-1.6.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index cf411461955..376a652d26e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,8 @@ pkgrel=1
arch=('i686' 'x86_64')
url='http://icedtea.classpath.org/wiki/IcedTea-Web'
license=('GPL2')
-makedepends=('java-environment-openjdk' 'zip' 'libxtst' 'npapi-sdk' 'rhino' 'junit'
+depends=('bin32-jre')
+makedepends=('java-environment-openjdk' 'zip' 'libxtst' 'npapi-sdk' 'rhino' 'junit' 'bin32-jdk'
'firefox' 'epiphany')
optdepends=('rhino: for using proxy auto config files')
# Due to broken path names in the tarball that fails with LANG=C in our chroot
@@ -26,9 +27,9 @@ build() {
./configure \
--prefix=/usr/share/${pkgbase} \
--datarootdir=/usr/share \
- --with-jdk-home=/usr/lib/jvm/default \
- --with-jre-home=/usr/lib/jvm/default-runtime \
- --with-java=/usr/bin/java \
+ --with-jdk-home=/usr/lib32/jvm/default \
+ --with-jre-home=/usr/lib32/jvm/default-runtime \
+ --with-java=/usr/bin/java32 \
--with-browser-tests \
--with-firefox=/usr/bin/firefox \
--with-epiphany=/usr/bin/epiphany