diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-07 18:10:48 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-07 18:10:48 +0100 |
| commit | 61733e7ff1a756e9325154d9d52cdcdeb27d9097 (patch) | |
| tree | a0f842807088c4986fb918be0de70bac3f18ea04 /extra/openjdk6 | |
| parent | 42badd081241c57a3b9bbd7a18dec85e64038314 (diff) | |
| parent | 5a680f7689b01b4b7a0bfade1a6c1f659f8cbed4 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/bin2iso/PKGBUILD
community/espeak/PKGBUILD
community/gnash/PKGBUILD
community/gtk2hs-buildtools/PKGBUILD
community/haskell-binary/PKGBUILD
community/haskell-dataenc/PKGBUILD
community/haskell-ghc-paths/PKGBUILD
community/haskell-haskeline/PKGBUILD
community/haskell-hslogger/PKGBUILD
community/haskell-tar/PKGBUILD
community/haskell-terminfo/PKGBUILD
community/haskell-utf8-string/PKGBUILD
community/haskell-x11-xft/PKGBUILD
community/kmess/PKGBUILD
community/libident/PKGBUILD
community/lwm/PKGBUILD
core/dialog/PKGBUILD
core/gcc/PKGBUILD
core/libtool/PKGBUILD
core/ppl/PKGBUILD
extra/boost/PKGBUILD
extra/dnsmasq/PKGBUILD
extra/ghc/PKGBUILD
extra/haskell-html/PKGBUILD
extra/haskell-http/PKGBUILD
extra/haskell-mtl/PKGBUILD
extra/haskell-network/PKGBUILD
extra/haskell-parsec/PKGBUILD
extra/haskell-quickcheck/PKGBUILD
extra/haskell-regex-base/PKGBUILD
extra/haskell-regex-compat/PKGBUILD
extra/haskell-regex-posix/PKGBUILD
extra/haskell-text/PKGBUILD
extra/haskell-transformers/PKGBUILD
extra/haskell-zlib/PKGBUILD
extra/liborigin2/PKGBUILD
extra/libpst/PKGBUILD
extra/mkvtoolnix/PKGBUILD
extra/pekwm/PKGBUILD
extra/soprano/PKGBUILD
extra/udisks/PKGBUILD
multilib-testing/lib32-libpciaccess/PKGBUILD
multilib/gcc-multilib/PKGBUILD
multilib/lib32-glibc/PKGBUILD
multilib/lib32-glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch
multilib/lib32-glibc/glibc-2.15-ifunc.patch
multilib/lib32-glibc/glibc-2.15-revert-netlink-cache.patch
multilib/lib32-glibc/glibc-2.15-scanf.patch
multilib/libtool-multilib/PKGBUILD
staging/kdeedu-kig/PKGBUILD
staging/kdeedu-rocs/PKGBUILD
testing/libpciaccess/PKGBUILD
testing/mkinitcpio-busybox/PKGBUILD
testing/xorg-server/PKGBUILD
Diffstat (limited to 'extra/openjdk6')
| -rw-r--r-- | extra/openjdk6/PKGBUILD | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/extra/openjdk6/PKGBUILD b/extra/openjdk6/PKGBUILD index 11f2004e4..423532c37 100644 --- a/extra/openjdk6/PKGBUILD +++ b/extra/openjdk6/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 150232 2012-02-15 10:39:26Z andyrtr $ +# $Id: PKGBUILD 151907 2012-03-03 18:57:24Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> @@ -9,7 +9,7 @@ _icedteaver=1.11.1 _openjdk_version=b24 _openjdk_date=14_nov_2011 pkgver=${_javaver}.${_openjdk_version}_${_icedteaver} -pkgrel=1 +pkgrel=2 url='http://icedtea.classpath.org' arch=('i686' 'x86_64' 'mips64el') license=('custom') @@ -75,7 +75,8 @@ build() { --with-jaxp-drop-zip=${srcdir}/jaxp144_03.zip \ --with-jaxws-drop-zip=${srcdir}/jdk6-jaxws2_1_6-2011_06_13.zip \ --with-jaf-drop-zip=${srcdir}/jdk6-jaf-b20.zip \ - --disable-bootstrap + --disable-bootstrap \ + --with-abs-install-dir=${_jvmdir} LD_PRELOAD="" make } |