diff options
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 20 |
2 files changed, 18 insertions, 6 deletions
@@ -6,7 +6,7 @@ pkgbase = ant19 arch = any license = APACHE makedepends = bash - makedepends = bin32-jdk6 + makedepends = bin32-jdk7 makedepends = junit makedepends = java-hamcrest source = https://www.apache.org/dist/ant/source/apache-ant-1.9.15-src.tar.bz2 @@ -23,7 +23,7 @@ pkgbase = ant19 sha256sums = 1f99f054e9b1e412d29823088f3fa7cfce90a7af25d907a60a6d7908a6b97ea4 pkgname = ant19 - depends = bin32-jdk6 + depends = bin32-jdk7 depends = bash optdepends = junit: junit tasks optdepends = java-hamcrest: junit tasks @@ -7,12 +7,12 @@ pkgbase=ant19 _pkgbase=ant pkgname=('ant19' 'ant19-doc') pkgver=1.9.15 -pkgrel=2 +pkgrel=3 pkgdesc='Java based build tool' url='https://ant.apache.org/' arch=('any') license=('APACHE') -makedepends=('bash' 'bin32-jdk6' 'junit' 'java-hamcrest') +makedepends=('bash' 'bin32-jdk7' 'junit' 'java-hamcrest') source=(https://www.apache.org/dist/ant/source/apache-${_pkgbase}-${pkgver}-src.tar.bz2{,.asc} ant.conf apache-ant-1.9.15-https-and-repo-urls.patch @@ -44,7 +44,7 @@ prepare() { build() { cd apache-${_pkgbase}-${pkgver} - export JAVA_HOME=/usr/lib32/jvm/java-6-jdk + export JAVA_HOME=/usr/lib/jvm/java-7-jdk ./bootstrap.sh bootstrap/bin/ant -Ddest=optional -f fetch.xml _replace_lib /usr/share/java/junit.jar lib/optional/junit-4.12.jar @@ -54,7 +54,7 @@ build() { } package_ant19() { - depends=('bin32-jdk6' 'bash') + depends=('bin32-jdk7' 'bash') optdepends=('junit: junit tasks' 'java-hamcrest: junit tasks') conflicts=('ant') @@ -88,3 +88,15 @@ package_ant19-doc() { } # vim: ts=2 sw=2 et: + +# i486-specific +if [ "${CARCH}" = "i486" ]; then + _JARCH=i386 + _DOC_ARCH=x86 +fi + +# pentium4-specific +if [ "${CARCH}" = "pentium4" ]; then + _JARCH=i386 + _DOC_ARCH=x86 +fi |