diff options
Diffstat (limited to 'extra/java7-openjdk')
| -rw-r--r-- | extra/java7-openjdk/PKGBUILD | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD index e19cf6b53..b6577ff1d 100644 --- a/extra/java7-openjdk/PKGBUILD +++ b/extra/java7-openjdk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 150234 2012-02-15 16:00:28Z andyrtr $ +# $Id: PKGBUILD 152428 2012-03-06 20:36:57Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Guillaume ALAUX <guillaume@archlinux.org> @@ -24,7 +24,7 @@ _OPENJDK_CHANGESET=22cc03983e20 _bootstrap=0 # 0/1 for quick build or full bootstrap pkgver=${_java_ver}.${_openjdk_build}_${_icedtea_ver} -pkgrel=1 +pkgrel=3 arch=('i686' 'x86_64') url="http://icedtea.classpath.org" license=('custom') @@ -93,6 +93,7 @@ build() { [ -f /etc/profile.d/jdk.sh ] && . /etc/profile.d/jdk.sh unset MAKEFLAGS # parallel build is currently broken + export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}" export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}" @@ -122,7 +123,8 @@ build() { --with-langtools-src-zip=${srcdir}/${_LANGTOOLS_CHANGESET}.tar.gz \ --enable-pulse-java \ --enable-nss \ - --with-rhino + --with-rhino \ + --with-abs-install-dir=${_jvmdir} #--help # --enable-systemtap Enable inclusion of SystemTap trace support - needs systemtab from AUR + --with-abs-install-dir=/usr/lib/jvm/java-7-openjdk The absolute path where the j2sdk-image dir will be installed @@ -141,8 +143,8 @@ package_jre7-openjdk-headless() { 'ca-certificates-java' 'rhino') optdepends=('libcups: needed for Java Mauve support - libmawt.so' 'fontconfig: needed for Java Mauve support - libmawt.so') - provides=('java-runtime=7') - conflicts=('java-runtime' 'openjdk6') + provides=('java-runtime-headless=7') + conflicts=('openjdk6') # replaces=('openjdk6') # once we remove openjdk6 pkg from the repos backup=(etc/profile.d/jre.sh etc/profile.d/jre.csh @@ -263,8 +265,10 @@ package_jre7-openjdk() { 'alsa-lib: for basic sound support' 'giflib: for gif format support' 'libpulse: for advanced sound support' - 'gtk2: for the Gtk+ look and feel - desktop usage') + 'gtk2: for the Gtk+ look and feel - desktop usage' + 'libxtst: linked in xawt/libmawt.so - desktop usage') install=jre7-openjdk.install + provides=('java-runtime=7') conflicts=('openjdk6') mv ${srcdir}/tmp-desktop-jre/* ${pkgdir} |