diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD index 68950b406..689ba5f75 100644 --- a/extra/java7-openjdk/PKGBUILD +++ b/extra/java7-openjdk/PKGBUILD @@ -9,25 +9,24 @@ # original changeset left commented to be able to spot changes on package upgrades # - added our architectures to set _JARCH # - strip -D_FORTIFY_SOURCE=2 from C/CXXFLAGS -# - patch to remove a patch that fails with the zero hotspot pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk' 'openjdk7-src') pkgbase=java7-openjdk _java_ver=7 _updatever=u17 -_icedtea_ver=2.3.8 +_icedtea_ver=2.3.9 # check "${srcdir}/icedtea7"/Makefile.am -_CORBA_CHANGESET=516aae5f27cf -_JAXP_CHANGESET=1fbe99283d97 -_JAXWS_CHANGESET=3c7be82314bf -_JDK_CHANGESET=deac45dc94f0 -_LANGTOOLS_CHANGESET=41426c72b802 -_OPENJDK_CHANGESET=ed02a059ea15 +_CORBA_CHANGESET=47a6bf94ce11 +_JAXP_CHANGESET=d2142901bcb7 +_JAXWS_CHANGESET=b1877762d45c +_JDK_CHANGESET=8e91101e36f0 +_LANGTOOLS_CHANGESET=fd956199cb82 +_OPENJDK_CHANGESET=12b96a57263c -#_HOTSPOT_CHANGESET=a152dced63a1 # see "${srcdir}/icedtea7"/hotspot.map -_HOTSPOT_CHANGESET=d8b22e079abe +#_HOTSPOT_CHANGESET=ad5a321edea2 # see "${srcdir}/icedtea7"/hotspot.map +_HOTSPOT_CHANGESET=2c4981784101 _bootstrap=0 # 0/1 for quick build or full bootstrap @@ -59,16 +58,15 @@ source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar jdk7-openjdk.profile jdk7-openjdk.profile.csh jre7-openjdk.profile - jre7-openjdk.profile.csh - alarm.patch) -sha256sums=('750a4c6e3e22369aa7dcfb0751fe85d5ea7a36b32871861c5063dbcadddc7153' - '865030303330856c988e353bf1bc86fc95669179b0958a4072538fc59d9a073b' - '181ceb85a4dade1a8d8465e2d69255ee3612dbc5a50699a59a4f21e69be7a1c6' - 'ed3a963c4309316fba654f0a60ba4bec21b2d170e64423eddfa2ba635ac76572' - '4abe7366900327a0de21caee8a7b0ea5494821507a02bfb07cffc980cebe90ad' - '00e3e4cb436f4153434faa2d1063114a9028e9c8a7eacf558873053c47365215' - 'cbef395a2af27673a3611ed50d84a76ae9f9539a7c42ed8e06e171bfc1ac030c' - '28883ebefcfff1ba8b356a7fabf8e449c25fe7fffe1d563f1f58f887100063f0' + jre7-openjdk.profile.csh) +sha256sums=('7e1fdd4c53c9772337c971b6f6f8058dabd99d7f4c4fcc85c88d836c9005c6da' + '651f99364e451d79156c879b8c8e47b8568fb3b4e4d28ebc38d36028acbed8bc' + '7346565688c3f01872af2c16a491233325ad5e924475dc89ff01f50582814934' + '8cad2dfee2d5e58a217193dcc9650debe519f72df7c136a15311195c9a1b48d6' + 'b8e109ac705b95e5605280c8ae13319a128e16eac950a455bfa30364ae4192cc' + '349009abfc8df1575336648bebd8a5ff0cb0f2ad045f6b661d88691411881d5e' + '2806de9d41a91acff5bb917ec9dc41cb805e893b43828491b920f9ec14b53b12' + '977617c76292f1de33b83daba80815a743159a9d050be2326ae41e20923e3a2b' '9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f' '7b2db65bfb9d5014e1522178d65cabf05dfa85e0926cde5648b5a338db376479' 'b742113dc6debc3eb92a246e442595481c04a2a3973e7902b86037acb50050ea' @@ -76,8 +74,7 @@ sha256sums=('750a4c6e3e22369aa7dcfb0751fe85d5ea7a36b32871861c5063dbcadddc7153' 'bd55299e08e6f8e61ba5baad0990170891801a29a1e8137e502b5e8a10fc37ea' '3f28f8bfc6dd105a07f747d7135c77a77de433e2b8647dd7520a900135203fbd' 'b7c045b08ad55a9f79390c104fa846d0e7dbb49fccffb2fab2a3824b6b19c9c8' - '89d99d8ac269ca66e2e279aff652d5aac938a35faec93cd8cff8f048052bd3ce' - 'dd55b150e6119bb82e4b55365ace7e4a6695a4e36047ba91c89db107da9c485c') + '89d99d8ac269ca66e2e279aff652d5aac938a35faec93cd8cff8f048052bd3ce') noextract=("${_OPENJDK_CHANGESET}.tar.gz" "${_CORBA_CHANGESET}.tar.gz" @@ -97,13 +94,7 @@ build() { cd "${srcdir}/icedtea-${_icedtea_ver}" CFLAGS=`echo $CFLAGS | sed -e 's/-D_FORTIFY_SOURCE=2//'` && CXXFLAGS="$CFLAGS" - patch -p1 -i ../alarm.patch -# 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 - export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}" export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}" diff --git a/extra/java7-openjdk/alarm.patch b/extra/java7-openjdk/alarm.patch deleted file mode 100644 index 136c0a480..000000000 --- a/extra/java7-openjdk/alarm.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -urN a/Makefile.am b/Makefile.am ---- a/Makefile.am 2013-03-11 12:44:50.432980398 -0600 -+++ b/Makefile.am 2013-03-21 15:49:27.252081589 -0600 -@@ -243,8 +243,7 @@ - ICEDTEA_PATCHES = \ - patches/8006179-lookup_using_findvirtual.patch \ - patches/8006882-sun.proxy.patch \ -- patches/pr1303-ifdef_fix.patch \ -- patches/revert-7017193.patch -+ patches/pr1303-ifdef_fix.patch - - # Conditional patches - -diff -urN a/Makefile.in b/Makefile.in ---- a/Makefile.in 2013-03-11 12:45:24.481530253 -0600 -+++ b/Makefile.in 2013-03-21 15:49:11.552131813 -0600 -@@ -636,7 +636,7 @@ - # Patch list - ICEDTEA_PATCHES = patches/8006179-lookup_using_findvirtual.patch \ - patches/8006882-sun.proxy.patch patches/pr1303-ifdef_fix.patch \ -- patches/revert-7017193.patch $(am__append_5) $(am__append_6) \ -+ $(am__append_5) $(am__append_6) \ - $(am__append_7) $(am__append_8) $(am__append_9) \ - $(am__append_10) $(am__append_11) $(am__append_12) \ - $(am__append_13) $(am__append_14) $(am__append_15) \