diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-14 16:10:04 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-14 16:10:04 +0100 |
| commit | 96f47f7059e8ad389d0aa757b2c66ad7cd8daf74 (patch) | |
| tree | f107c3838373376ef130dcfcb5a980cf8ad30a5f /extra/java7-openjdk/PKGBUILD | |
| parent | 40ece75655aebe0dd951a0489ed2111f1c27f8a8 (diff) | |
| parent | 3ff20dedff636571ad0faa4736af5b23e4623ffe (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/cantata/PKGBUILD
community/gpsmanshp/PKGBUILD
community/pigz/PKGBUILD
extra/calligra/PKGBUILD
extra/genius/PKGBUILD
extra/gnumeric/PKGBUILD
extra/goffice/PKGBUILD
extra/graphicsmagick/PKGBUILD
extra/libgphoto2/PKGBUILD
extra/python-numpy/PKGBUILD
Diffstat (limited to 'extra/java7-openjdk/PKGBUILD')
| -rw-r--r-- | extra/java7-openjdk/PKGBUILD | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD index b395e03a3..e937e4b61 100644 --- a/extra/java7-openjdk/PKGBUILD +++ b/extra/java7-openjdk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 178897 2013-02-28 13:12:14Z guillaume $ +# $Id: PKGBUILD 179933 2013-03-12 17:11:40Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Maintainer: Guillaume ALAUX <guillaume@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> @@ -7,23 +7,23 @@ pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk' 'openjdk7-src' 'openjdk7-doc') pkgbase=java7-openjdk _java_ver=7 -_updatever=u13 -_icedtea_ver=2.3.7 +_updatever=u17 +_icedtea_ver=2.3.8 # check "${srcdir}/icedtea7"/Makefile.am -_CORBA_CHANGESET=82e58144c3fb -_JAXP_CHANGESET=1d46a56eb51c -_JAXWS_CHANGESET=b9590aa972b9 -_JDK_CHANGESET=6a3417030605 -_LANGTOOLS_CHANGESET=b5006c3285c6 -_OPENJDK_CHANGESET=506161df1c48 +_CORBA_CHANGESET=516aae5f27cf +_JAXP_CHANGESET=1fbe99283d97 +_JAXWS_CHANGESET=3c7be82314bf +_JDK_CHANGESET=deac45dc94f0 +_LANGTOOLS_CHANGESET=41426c72b802 +_OPENJDK_CHANGESET=ed02a059ea15 -_HOTSPOT_CHANGESET=104e2c65892d # see "${srcdir}/icedtea7"/hotspot.map +_HOTSPOT_CHANGESET=a152dced63a1 # see "${srcdir}/icedtea7"/hotspot.map _bootstrap=0 # 0/1 for quick build or full bootstrap pkgver=${_java_ver}.${_updatever}_${_icedtea_ver} -pkgrel=2 +pkgrel=1 arch=('i686' 'x86_64') url="http://icedtea.classpath.org" license=('custom') @@ -50,14 +50,14 @@ source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar jdk7-openjdk.profile.csh jre7-openjdk.profile jre7-openjdk.profile.csh) -sha256sums=('378f67f6f84bfb6c705f600b47b68a61b18d67648dd7eaf8498b152587695940' - '704bdd40bc328183384272ee282310d8fc3216f3051e504141e7660fe50185a0' - 'c438607d04e04439ca7df3d911f3cf46ac64066a5b21da98bea8070f98abdafe' - 'fca2c95b3e60533a937e4f8d497a2934382d9f1f95cde874d926f3b4841407ce' - 'c6ca4f98b35acdb24a81721de0bee2686bb83917bd84b108775e586c5ae81136' - '2a8afd9ecb53e255e436885e6fe3e9882e8657c70482a90ef39aa33e024e79b0' - '44d8bc14b213b7c218465a8859bd551feb6805857077ca6aa68aaa4c1b10b676' - '203acf2f9737032fe4bb1096e2f81417fa8a92a7016d8220b54a70efd579711a' +sha256sums=('750a4c6e3e22369aa7dcfb0751fe85d5ea7a36b32871861c5063dbcadddc7153' + '865030303330856c988e353bf1bc86fc95669179b0958a4072538fc59d9a073b' + '181ceb85a4dade1a8d8465e2d69255ee3612dbc5a50699a59a4f21e69be7a1c6' + 'ed3a963c4309316fba654f0a60ba4bec21b2d170e64423eddfa2ba635ac76572' + '4abe7366900327a0de21caee8a7b0ea5494821507a02bfb07cffc980cebe90ad' + '00e3e4cb436f4153434faa2d1063114a9028e9c8a7eacf558873053c47365215' + 'cbef395a2af27673a3611ed50d84a76ae9f9539a7c42ed8e06e171bfc1ac030c' + 'eac2313e3012653afa7549257765d56e4348c775363eee0733968d32a7c1eeae' '9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f' '7b2db65bfb9d5014e1522178d65cabf05dfa85e0926cde5648b5a338db376479' 'b742113dc6debc3eb92a246e442595481c04a2a3973e7902b86037acb50050ea' @@ -83,10 +83,10 @@ noextract=("${_OPENJDK_CHANGESET}.tar.gz" build() { cd "${srcdir}/icedtea-${_icedtea_ver}" - unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS +# unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS - # default is to build with first found java-environment found in our repos - is jdk7-openjdk - [ -f /etc/profile.d/jdk.sh ] && . /etc/profile.d/jdk.sh +# # default is to build with first found java-environment found in our repos - is jdk7-openjdk +# [ -f /etc/profile.d/jdk.sh ] && . /etc/profile.d/jdk.sh export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}" export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}" |