summaryrefslogtreecommitdiffstats
path: root/main/openjdk7
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2014-07-15 08:54:59 +0000
committerTimo Teräs <timo.teras@iki.fi>2014-07-15 08:56:21 +0000
commit76743edbe605967ecb20b4e59d22bda8f91c1de6 (patch)
tree975faf1af455cb29b8bc80fa2518a9979cfb6651 /main/openjdk7
parent0019412cc518dd8eb17f0b8385b45b1ad049cf5b (diff)
downloadaports-76743edbe605967ecb20b4e59d22bda8f91c1de6.tar.bz2
aports-76743edbe605967ecb20b4e59d22bda8f91c1de6.tar.xz
main/openjdk7: upgrade to icedtea 2.5.0
Diffstat (limited to 'main/openjdk7')
-rw-r--r--main/openjdk7/APKBUILD117
-rw-r--r--main/openjdk7/icedtea-hotspot-noagent-musl.patch31
-rw-r--r--main/openjdk7/icedtea-jdk-giflib51.patch14
-rw-r--r--main/openjdk7/icedtea-jdk-musl.patch91
4 files changed, 139 insertions, 114 deletions
diff --git a/main/openjdk7/APKBUILD b/main/openjdk7/APKBUILD
index 781192562..440041bb7 100644
--- a/main/openjdk7/APKBUILD
+++ b/main/openjdk7/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Timo Teras <timo.teras@iki.fi>
# Maintainer: Timo Teras <timo.teras@iki.fi>
pkgname=openjdk7
-_icedteaver=2.4.7
-_openjdkupdate=55
+_icedteaver=2.5.0
+_openjdkupdate=60
pkgver=7.$_openjdkupdate.$_icedteaver
pkgrel=0
pkgdesc="Sun OpenJDK 7 via IcedTea"
@@ -21,15 +21,6 @@ install=""
# upstream binary versions
RHINO_VER=1_7R3
ANT_VER=1.9.2
-# hashes from $_builddir/Makefile.am
-_CORBA_CHANGESET=e6ad5b912691
-_JAXP_CHANGESET=94b7e8e0d96f
-_JAXWS_CHANGESET=bd9a50a78d04
-_JDK_CHANGESET=9448fff93286
-_LANGTOOLS_CHANGESET=8c26a3c39128
-_OPENJDK_CHANGESET=13970e76b784
-# hash from $_builddir/hotspot.map
-_HOTSPOT_CHANGESET=69b542696e5b
case $CARCH in
x86) _jarch=i386;;
@@ -56,16 +47,17 @@ else
BOOTSTRAP_JAVA_HOME="$INSTALL_BASE"
fi
-_hgurl=http://icedtea.classpath.org/hg/release/icedtea7-forest-${_icedteaver:0:3}
+_dropsver=2.5
+_dropsurl=http://icedtea.classpath.org/download/drops/icedtea7/$_dropsver
source="http://icedtea.classpath.org/download/source/icedtea-$_icedteaver.tar.gz
- openjdk-${_OPENJDK_CHANGESET}.tar.gz::$_hgurl/archive/${_OPENJDK_CHANGESET}.tar.gz
- corba-${_CORBA_CHANGESET}.tar.gz::$_hgurl/corba/archive/${_CORBA_CHANGESET}.tar.gz
- jaxp-${_JAXP_CHANGESET}.tar.gz::$_hgurl/jaxp/archive/${_JAXP_CHANGESET}.tar.gz
- jaxws-${_JAXWS_CHANGESET}.tar.gz::$_hgurl/jaxws/archive/${_JAXWS_CHANGESET}.tar.gz
- jdk-${_JDK_CHANGESET}.tar.gz::$_hgurl/jdk/archive/${_JDK_CHANGESET}.tar.gz
- langools-${_LANGTOOLS_CHANGESET}.tar.gz::$_hgurl/langtools/archive/${_LANGTOOLS_CHANGESET}.tar.gz
- hotspot-${_HOTSPOT_CHANGESET}.tar.gz::$_hgurl/hotspot/archive/${_HOTSPOT_CHANGESET}.tar.gz
+ saveas-$_dropsurl/openjdk.tar.bz2/openjdk-$_dropsver.tar.bz2
+ saveas-$_dropsurl/corba.tar.bz2/corba-$_dropsver.tar.bz2
+ saveas-$_dropsurl/jaxp.tar.bz2/jaxp-$_dropsver.tar.bz2
+ saveas-$_dropsurl/jaxws.tar.bz2/jaxws-$_dropsver.tar.bz2
+ saveas-$_dropsurl/jdk.tar.bz2/jdk-$_dropsver.tar.bz2
+ saveas-$_dropsurl/langtools.tar.bz2/langtools-$_dropsver.tar.bz2
+ saveas-$_dropsurl/hotspot.tar.bz2/hotspot-$_dropsver.tar.bz2
http://archive.apache.org/dist/ant/binaries/apache-ant-$ANT_VER-bin.tar.gz
ftp://ftp.mozilla.org/pub/mozilla.org/js/rhino$RHINO_VER.zip
@@ -80,6 +72,7 @@ source="http://icedtea.classpath.org/download/source/icedtea-$_icedteaver.tar.gz
icedtea-jdk-iconv-uclibc.patch
icedtea-jdk-musl.patch
icedtea-jdk-no-soname.patch
+ icedtea-jdk-giflib51.patch
"
# icedtea6-1.9.7-generate_cacerts-1.patch
@@ -143,7 +136,7 @@ build() {
./configure \
--build=$CBUILD \
--host=$CHOST \
- --prefix=/usr \
+ --prefix=$INSTALL_BASE \
--sysconfdir=/etc \
--mandir=/usr/share/man \
--infodir=/usr/share/info \
@@ -152,16 +145,15 @@ build() {
--disable-dependency-tracking \
--disable-downloading \
--with-rhino=$srcdir/rhino$RHINO_VER/js.jar \
- --with-openjdk-src-zip=$srcdir/openjdk-${_OPENJDK_CHANGESET}.tar.gz \
- --with-hotspot-src-zip=$srcdir/hotspot-${_HOTSPOT_CHANGESET}.tar.gz \
- --with-corba-src-zip=$srcdir/corba-${_CORBA_CHANGESET}.tar.gz \
- --with-jaxp-src-zip=$srcdir/jaxp-${_JAXP_CHANGESET}.tar.gz \
- --with-jaxws-src-zip=$srcdir/jaxws-${_JAXWS_CHANGESET}.tar.gz \
- --with-jdk-src-zip=$srcdir/jdk-${_JDK_CHANGESET}.tar.gz \
- --with-langtools-src-zip=$srcdir/langools-${_LANGTOOLS_CHANGESET}.tar.gz \
+ --with-openjdk-src-zip=$srcdir/openjdk-$_dropsver.tar.bz2 \
+ --with-hotspot-src-zip=$srcdir/hotspot-$_dropsver.tar.bz2 \
+ --with-corba-src-zip=$srcdir/corba-$_dropsver.tar.bz2 \
+ --with-jaxp-src-zip=$srcdir/jaxp-$_dropsver.tar.bz2 \
+ --with-jaxws-src-zip=$srcdir/jaxws-$_dropsver.tar.bz2 \
+ --with-jdk-src-zip=$srcdir/jdk-$_dropsver.tar.bz2 \
+ --with-langtools-src-zip=$srcdir/langtools-$_dropsver.tar.bz2 \
--with-pax=paxctl \
--with-jdk-home=$BOOTSTRAP_JAVA_HOME \
- --with-abs-install-dir=$INSTALL_BASE \
--with-pkgversion="Alpine ${pkgver}-r${pkgrel}" \
|| return 1
@@ -229,66 +221,69 @@ doc() {
mv "$pkgdir"/$INSTALL_BASE/man "$subpkgdir"/$INSTALL_BASE/
}
-md5sums="3e2c46f5b0bce2821af79bb286b451b8 icedtea-2.4.7.tar.gz
-b0295fd54825d3f47d47de81d81a475a openjdk-13970e76b784.tar.gz
-0a8f2235307b68553865ac38192690c7 corba-e6ad5b912691.tar.gz
-ba7a21a3ef2ce5d0d47c7015e43c5dcf jaxp-94b7e8e0d96f.tar.gz
-9ef2ea5b1e87777c75a72e1dca6fab1d jaxws-bd9a50a78d04.tar.gz
-cea74e96852bf017f73222fa7045daee jdk-9448fff93286.tar.gz
-449cec19b80ab70935d02d03e3cbc568 langools-8c26a3c39128.tar.gz
-0381ef3920f1ff5c8ac6c8860974d8cc hotspot-69b542696e5b.tar.gz
+md5sums="62435458bd87b340ae30306e67af8f60 icedtea-2.5.0.tar.gz
+5a32302cc14e7bb113d399bc9a017b23 openjdk-2.5.tar.bz2
+bfcdcf4d91e511056fc81a0d771fbdff corba-2.5.tar.bz2
+34ce2eab91aaba3efb500a3b02051cca jaxp-2.5.tar.bz2
+590460868b1c4911d3f57c4f5a80ecc7 jaxws-2.5.tar.bz2
+2f2e28645f2203576d416115d5cdbd85 jdk-2.5.tar.bz2
+83a383d30ebc7edaa857430ec997091b langtools-2.5.tar.bz2
+964b7e610177db849dbe0b2483a564a1 hotspot-2.5.tar.bz2
9a2826a1819aa128629778217af36c55 apache-ant-1.9.2-bin.tar.gz
99d94103662a8d0b571e247a77432ac5 rhino1_7R3.zip
7ea70e69d307dfb801a198bce51405b0 fix-paxctl-args.patch
86829ac37f02f0d631ddde5f164a0015 icedtea-build-paxmark.patch
f87dd2c4c3c97fc3ac33080a65ca9e14 icedtea-hotspot-musl.patch
-573e12eeae80a34541f00d5be75d6c0f icedtea-hotspot-noagent-musl.patch
+aefe00f7f9b91805f402efad9208dd53 icedtea-hotspot-noagent-musl.patch
43023861c5f6efc3139a834aa3ec0476 icedtea-hotspot-uclibc-fixes.patch
07c7ab583808e8c8ceb46aff9c265aa4 icedtea-jdk-fix-build.patch
bd623081d5d2e63694c3649975b12412 icedtea-jdk-execinfo.patch
250b0807b59762670954b132e8f8dfba icedtea-jdk-fix-ipv6-init.patch
7c0814181e5adc0763c5c0a24b01d4cb icedtea-jdk-iconv-uclibc.patch
-5b1b624b7127434c0c6329d733c917c9 icedtea-jdk-musl.patch
-d014431e70cdabb82a75e4b9ae4c28a9 icedtea-jdk-no-soname.patch"
-sha256sums="754350cbd704b22b7ba3d14c8283eb2d896d137824f95a9e6a2b34678658ade1 icedtea-2.4.7.tar.gz
-bcd45546509defc439f42f230c0ca64e8aa6ec00542c3634aab3a4c10be3fe6b openjdk-13970e76b784.tar.gz
-cc37272df260d08207c84763d4c39d7807728ba2d5908276b9bc63e925e70674 corba-e6ad5b912691.tar.gz
-3515cd105c29563bf78432576e658005386f45d7c3b2b7eac7af86cf196aaaea jaxp-94b7e8e0d96f.tar.gz
-3e107628080d84a80a78ef0ef9dc3664989291dd17c8bacf031d59fba7bd7f4d jaxws-bd9a50a78d04.tar.gz
-9222e5317264f20d4a0b8170b4c4d02459cda98333c18e3a75064e7856ff58be jdk-9448fff93286.tar.gz
-5af29e32344e2f2fc0beb31f91b8312f2a0d6d02c53b4cb700ee2e27bcf1043b langools-8c26a3c39128.tar.gz
-e3bbed298ed7c77169fdfddc47cdb85c62ef2e5e7ea04ca28aa8779861efca65 hotspot-69b542696e5b.tar.gz
+66f6e66eb135f0d88847910f6581d323 icedtea-jdk-musl.patch
+d014431e70cdabb82a75e4b9ae4c28a9 icedtea-jdk-no-soname.patch
+529dd5e5372112470dacc08c95b0c22a icedtea-jdk-giflib51.patch"
+sha256sums="4e369e35dbf37a5fcc1a837861a74609bf907d3d0b9be7ac98d4f9c99dba7100 icedtea-2.5.0.tar.gz
+9a2f9486a48d51f84bdf9b9a52dc34fe90b886aa60ff5447b7f2502479065859 openjdk-2.5.tar.bz2
+1f9f07f31ce8588cd3cd12465f94e142c852c380059a3dab9831d86d3f264253 corba-2.5.tar.bz2
+59edb741e1b00243c040b399986960fad9e42f7e5dbe0a1e34798752b080c488 jaxp-2.5.tar.bz2
+ed3803635ed25f58cd86ad8ca27585f77cc50385da0342112980cc6ba8ff6028 jaxws-2.5.tar.bz2
+508b4e26704749172022c95f44c5aa9feb391e82b54a545fdb79f3a51c269f83 jdk-2.5.tar.bz2
+0eb9c19cfbecfbc6ef1e37f475d73f16469b9e1d969f69b1af4b10cbc2415659 langtools-2.5.tar.bz2
+645a43adaec3be3d3297479d134c02e444af9f0be33d35942f0ca863592fea26 hotspot-2.5.tar.bz2
cab1b8754e5f1f2aa869e2ba603903ae5e81a585de4eafd00f173531a11b5a45 apache-ant-1.9.2-bin.tar.gz
885b46e24fe5af23ad3712c5e08e8d97d6d92a4b89e1be860e8fe88e4a3dacd1 rhino1_7R3.zip
2c515d2664a3792561bd635b6df0dd24918feb3095ed938b1ec807b005928e69 fix-paxctl-args.patch
b81a5e40ce9a93409e8226fe73a228d1c277343fc4f8a888277beb0d5bf0f551 icedtea-build-paxmark.patch
a7922430cb767c8a4baae232c8b2e5f377aeb7cfde0c9901cd7774f078e7f92e icedtea-hotspot-musl.patch
-fb33409f6700f4ab69ca35f0684a5138f2afe0726ba5de7f9eaf16a18a25a77c icedtea-hotspot-noagent-musl.patch
+afed589db3dbd89513fc890d5b315ca2a5953e8915ff2f24d38448ec145266e9 icedtea-hotspot-noagent-musl.patch
0ef7592b8f2c954eda0a6cf4dc4a4010942f35ea426f44e34412be6c9a949745 icedtea-hotspot-uclibc-fixes.patch
33b18e827a13cc46be11a4491deefac171c8c2c4fbdd3e0cb4a5fdafa560f958 icedtea-jdk-fix-build.patch
6cebef19d8eec5a4623a96c37ae71b79d124a10478c1db33ad5fc71bc04b30e9 icedtea-jdk-execinfo.patch
632683ec88a6fb250ef043aae9cace605d0c669b7058f8c47b62b09b03ecc6c5 icedtea-jdk-fix-ipv6-init.patch
a36ff13d81a1f1415bedd595b77f2c43574c546938cce7882cb33bbe63464865 icedtea-jdk-iconv-uclibc.patch
-6a9f2e7e5f12db53feecaf5bb0afa977e45439722c040842db023c12209c0df2 icedtea-jdk-musl.patch
-6c0bbe710395c4ced1359ab279be6a7c36da5bfb9fd60dc47d920f06a0456d82 icedtea-jdk-no-soname.patch"
-sha512sums="e03bf4b521f8d11ac5b703b7959b8ee4688f4df486da8cb754cc88546e4f912dafb865f2f32bc37f6327417d928772870f2b6fd32c817298efdd33190c35f929 icedtea-2.4.7.tar.gz
-3898815c8c7b99e8b25d710f48ef25d9e0a5ac2c332ce3c1f870b30bfe1198492029767b75f0f8cb85f6b55e2432b14e8c71b0ceab0d25e6c047bfcde766a6f5 openjdk-13970e76b784.tar.gz
-ab787baa78e9494fc7a9d12351121a64392b5490409fabb6d343fcf78191e0a7f838d14e2251b35d6b8ac15df950e259bb6ae7a191934cf391a0c00774c4ce4c corba-e6ad5b912691.tar.gz
-b604b7e52453680a20bd303ffa389f937d9f31bb50016b9b359d39b7f4af6deca6cd1e5b3e13f2d40f0d0c46ae9c0370a31afd30b8cc64c5854020804dd38855 jaxp-94b7e8e0d96f.tar.gz
-2a1ccdcdf4f6058649514f98c718a542cbdb5e76e997ad77fbcc1a8a7efdf2f787d04909ef0434af07c97373626b5d439718161defe537eea8a2eb56b5405de5 jaxws-bd9a50a78d04.tar.gz
-498434ee55cd0ff0f9522b5e7ef6f69c7a54750ca24b336519e24822185e6311ad84ae84b40a470a34b870a19c0191433b49bfb195c5bc6f28f2d4f1f3ee4ac7 jdk-9448fff93286.tar.gz
-96a0d00bc7992d84bec61999e158f9a955233a1a15671a5496fed4fd270b40b6526bb11dc70e1e5c85f2fdbdf0df06efd3e805c910d2b7410d78c9c4fe78da8a langools-8c26a3c39128.tar.gz
-6480f7df5f139d5ade06fd949e7daaa258d7a8db972ac36690092fbedb3702b8a92e51d9504d445c6c4ed07fb47e088ccf6efc01b96e292e602eaf8f246b98ed hotspot-69b542696e5b.tar.gz
+b3f82269f69483d3fe137e369f9325003ce7872d886cdf67705b434ce949b5bc icedtea-jdk-musl.patch
+6c0bbe710395c4ced1359ab279be6a7c36da5bfb9fd60dc47d920f06a0456d82 icedtea-jdk-no-soname.patch
+77fba3032edf6cce549cd4e174d9296684b20f4589dc59179fcc8cba7426a4e9 icedtea-jdk-giflib51.patch"
+sha512sums="4ab51bc10f4a1dfa21bfd314402bad228c8ad29a1bad721fcd73691e7df79f5f75c6e5c48e08cb579117b79676c05c6618fe9b903065c13b9373f86b69f541c2 icedtea-2.5.0.tar.gz
+d0a3233035330c7ed1e6caf258a99277d218a8535d1141d182fc56376d311a7e866151cb9fae8c4cf5d68d9be24051506aa480b746849a0a0815a48109ba2cb5 openjdk-2.5.tar.bz2
+bb69ac9667927c0b5ed9b62e09d8df7db804e0053185db3aac5ed52e492a66e97872ef5c07f2f46e2c1d1beeeded8a7b583eaff5525d3939f5163d4c3fdadc2d corba-2.5.tar.bz2
+82ee79c7356676be5f68298fda3b7f83251e34faf24d316ddcdbe68a66b672e5cbbcafb60c85f234574404fea1fb70b0249dd0caf81eddbe5192b705db6f7eec jaxp-2.5.tar.bz2
+b411f07dce0e0a5eb0a3bab2dfe44c790a6f329157ca2d333123da272a727bec4997cffb97413db5b921ef5a37dcb32e2136b1eda20d0ed950cff93ba8299b9e jaxws-2.5.tar.bz2
+74ff0aa74a455f831213ab00b6bda7e6ac60b2287fbff5d5c29e3af0898bc5a06ca3ee0590ac59655923895a9bbd199a38fe988732371e7882422334915ec533 jdk-2.5.tar.bz2
+c1b0a891e8a7798084e75ca224e86938823c74a1d5e5ab43b49589389ded8ba7fb33cfc57e5439da4eab9cb27172cfcc925ef98498342e7362daecf46aa500dc langtools-2.5.tar.bz2
+516045b2acd4962100a16349b3889cfe27ddbfcec5450418e273738521c93e1aeebd6d348be17e0284952dd90b4ae80442dc3894edb8d2f633924be6654dcb2d hotspot-2.5.tar.bz2
618c0c3d80f7c44c2bb8cdfdc2b5278ccd926ab1aa0c8f7099bd0ad5cb4c090f023c0b86c8267052a0a6b1ac57076296fcc16042b9e7a72a1482af63c99e0e49 apache-ant-1.9.2-bin.tar.gz
77964485481e22d20459ea094c773e1930c5ef22d69bc449375a1ead31f340b3a652e2dd85c645e210be1abc8e623aeb560a5dc81629f388322af270ce868d36 rhino1_7R3.zip
f4be5689f72e333bda03d9e89aacfd7cd9bd79601d34bdd03fd2935b46efdc277168d8195e27d35c6dff814712a80c832cab2ff02b186c6cb701de3d2a89c6c8 fix-paxctl-args.patch
be5410260f05642d592ad16945041505277e3cda48e4693a74ab5d432e1c70976d873fa61510b03c6b5fa2b22178e234628a1c72bd568bb82b39c25fddc0ebec icedtea-build-paxmark.patch
994e8a79a0a23f26d633bf2ce9dad62198c699892f6e7729cc6e509481330399bb2ba736514b516fd2b3dd125fd6c74a127ae7f16d643c3f6a69776737cdb933 icedtea-hotspot-musl.patch
-22eb55b0910d51ff2f3f2ad2d7951d2c1d60ea07e0e9561e1110cc57d75a42cc7629ebdaf70722f3f3b76eb2d977b614249b3383118f7b295648bdfda97c9d95 icedtea-hotspot-noagent-musl.patch
+2b2cdf2c27f95ba5557748bcc49c27e498a1e2efb3526da8dea847f3b0a0776dfdd403e898c9bec9187135750183c89bde183c6fc6112109e39d984df77e9b44 icedtea-hotspot-noagent-musl.patch
822eee0dc4d3ba677a289dfeb3668b536d2d626708390a9d9702fb4144a481fd443a215a0d2041c6026113837aafa4ba0b5e9ead8589d2da6717a238bbc95a5a icedtea-hotspot-uclibc-fixes.patch
213a537de5f011cb39d608515c3413513ac75fb93593f9a9ef4205f71d72bdd8b097c80db185f7b26021d5bb85045b866f34f3478482dc4189972d8614a13458 icedtea-jdk-fix-build.patch
0391970e6a32946aa3cccf38fdef9c0fe2af26cd0df824b98aa2fcfa1bf661d4a68e339bffcfd16f386c565fc68bb28a29208a67d4bad8a0e847ad02bd8becbb icedtea-jdk-execinfo.patch
48533f87fc2cf29d26b259be0df51087d2fe5b252e72d00c6ea2f4add7b0fb113141718c116279c5905e03f64a1118082e719393786811367cf4d472b5d36774 icedtea-jdk-fix-ipv6-init.patch
a6ee1c63a171859ab1350481bc3e5d464354f1105d80fc72c1d58620672ca5c1a550b954b35917f89537f0aeb28c49470b27522ce53588e42dedff41e074774c icedtea-jdk-iconv-uclibc.patch
-2da5596c01317cb6ce0183df0a0d7c1f6ab7b05b8060c5808300e24482ff2772206cbfc733d7b0cd66460f24d9b08b9109afdafcb293c12e98b79d307afd1b51 icedtea-jdk-musl.patch
-bf4b184e170f7b0ff64ab30d2162784fe2bd5460d1fa31973259f7065fd4c511c46f97724fe2bd72bb94e9006cb568d0e0c87d1a9c90819e65880f8f44830bb1 icedtea-jdk-no-soname.patch"
+44a35941c80f408d0607e32763b3b6ccee21e1d39886309327d3d74d2900117e4346ef59e77c663fd022fec10ee8f365eeb46c1260014d5765d226ce175ce3c5 icedtea-jdk-musl.patch
+bf4b184e170f7b0ff64ab30d2162784fe2bd5460d1fa31973259f7065fd4c511c46f97724fe2bd72bb94e9006cb568d0e0c87d1a9c90819e65880f8f44830bb1 icedtea-jdk-no-soname.patch
+b4a90ef63dbaec764569a671f850db42a2257b729858923a3831dafaa098c61a635462ee5c72e7fb3ddb2e54d6ee98ff69bf2b4b4f3ec9310f54caf7739e9e82 icedtea-jdk-giflib51.patch"
diff --git a/main/openjdk7/icedtea-hotspot-noagent-musl.patch b/main/openjdk7/icedtea-hotspot-noagent-musl.patch
index 176b99311..627149fd4 100644
--- a/main/openjdk7/icedtea-hotspot-noagent-musl.patch
+++ b/main/openjdk7/icedtea-hotspot-noagent-musl.patch
@@ -1,6 +1,7 @@
---- openjdk.orig/hotspot/make/linux/makefiles/defs.make
-+++ openjdk/hotspot/make/linux/makefiles/defs.make
-@@ -285,6 +285,9 @@
+diff -ru openjdk.orig/hotspot/make/linux/makefiles/defs.make openjdk/hotspot/make/linux/makefiles/defs.make
+--- openjdk.orig/hotspot/make/linux/makefiles/defs.make 2014-06-05 21:19:11.000000000 +0000
++++ openjdk/hotspot/make/linux/makefiles/defs.make 2014-07-15 07:16:37.789777380 +0000
+@@ -306,6 +306,9 @@
# Serviceability Binaries
# No SA Support for PPC, IA64, ARM or zero
@@ -10,19 +11,20 @@
ADD_SA_BINARIES/x86 = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \
$(EXPORT_LIB_DIR)/sa-jdi.jar
ADD_SA_BINARIES/sparc = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \
-@@ -301,6 +304,10 @@
- endif
+@@ -323,6 +326,10 @@
endif
endif
-+endif
+ endif
+else
+ADD_SA_BINARIES/x86 =
+ADD_SA_BINARIES/sparc =
- endif
++endif
ADD_SA_BINARIES/ppc =
+ ADD_SA_BINARIES/ppc64 =
ADD_SA_BINARIES/ia64 =
---- openjdk.orig/hotspot/make/linux/makefiles/sa.make
-+++ openjdk/hotspot/make/linux/makefiles/sa.make
+diff -ru openjdk.orig/hotspot/make/linux/makefiles/sa.make openjdk/hotspot/make/linux/makefiles/sa.make
+--- openjdk.orig/hotspot/make/linux/makefiles/sa.make 2014-06-05 21:19:11.000000000 +0000
++++ openjdk/hotspot/make/linux/makefiles/sa.make 2014-07-15 07:16:37.789777380 +0000
@@ -59,9 +59,11 @@
# if $(AGENT_DIR) does not exist, we don't build SA
@@ -36,9 +38,10 @@
-a "$(SRCARCH)" != "zero" ] ; then \
$(MAKE) -f sa.make $(GENERATED)/sa-jdi.jar; \
fi
---- openjdk.orig/hotspot/make/linux/makefiles/saproc.make
-+++ openjdk/hotspot/make/linux/makefiles/saproc.make
-@@ -65,10 +65,13 @@
+diff -ru openjdk.orig/hotspot/make/linux/makefiles/saproc.make openjdk/hotspot/make/linux/makefiles/saproc.make
+--- openjdk.orig/hotspot/make/linux/makefiles/saproc.make 2014-06-05 21:19:11.000000000 +0000
++++ openjdk/hotspot/make/linux/makefiles/saproc.make 2014-07-15 07:16:37.789777380 +0000
+@@ -65,12 +65,15 @@
# if $(AGENT_DIR) does not exist, we don't build SA
# also, we don't build SA on Itanium or zero.
@@ -48,7 +51,9 @@
ifneq ($(wildcard $(AGENT_DIR)),)
ifneq ($(filter-out ia64 zero,$(SRCARCH)),)
BUILDLIBSAPROC = $(LIBSAPROC)
-+endif
endif
endif
++endif
+ ifneq ($(ALT_SASRCDIR),)
+ ALT_SAINCDIR=-I$(ALT_SASRCDIR)
diff --git a/main/openjdk7/icedtea-jdk-giflib51.patch b/main/openjdk7/icedtea-jdk-giflib51.patch
new file mode 100644
index 000000000..a9361573c
--- /dev/null
+++ b/main/openjdk7/icedtea-jdk-giflib51.patch
@@ -0,0 +1,14 @@
+--- openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c.orig 2014-05-27 22:17:19.766866065 +0200
++++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c 2014-05-27 22:16:35.452894426 +0200
+@@ -310,7 +310,11 @@
+ free(pBitmapBits);
+ free(pOldBitmapBits);
+
++#if GIFLIB_MAJOR >= 5
++ DGifCloseFile(gif, NULL);
++#else
+ DGifCloseFile(gif);
++#endif
+
+ return 1;
+ }
diff --git a/main/openjdk7/icedtea-jdk-musl.patch b/main/openjdk7/icedtea-jdk-musl.patch
index b5456f9ae..49c16d73a 100644
--- a/main/openjdk7/icedtea-jdk-musl.patch
+++ b/main/openjdk7/icedtea-jdk-musl.patch
@@ -1,5 +1,6 @@
---- openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp
-+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp
+diff -ru openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp
+--- openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp 2014-06-12 20:14:44.000000000 +0000
++++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp 2014-07-15 07:19:52.186682096 +0000
@@ -46,6 +46,8 @@
#include "zip.h"
@@ -9,8 +10,9 @@
#ifdef NO_ZLIB
inline bool jar::deflate_bytes(bytes& head, bytes& tail) {
---- openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h
-+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h
+diff -ru openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h
+--- openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h 2014-06-12 20:14:44.000000000 +0000
++++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h 2014-07-15 07:19:52.186682096 +0000
@@ -23,9 +23,7 @@
* questions.
*/
@@ -22,8 +24,9 @@
struct unpacker;
---- openjdk.orig/jdk/src/share/native/sun/awt/medialib/mlib_types.h
-+++ openjdk/jdk/src/share/native/sun/awt/medialib/mlib_types.h
+diff -ru openjdk.orig/jdk/src/share/native/sun/awt/medialib/mlib_types.h openjdk/jdk/src/share/native/sun/awt/medialib/mlib_types.h
+--- openjdk.orig/jdk/src/share/native/sun/awt/medialib/mlib_types.h 2014-06-12 20:14:44.000000000 +0000
++++ openjdk/jdk/src/share/native/sun/awt/medialib/mlib_types.h 2014-07-15 07:19:52.186682096 +0000
@@ -27,6 +27,7 @@
#ifndef MLIB_TYPES_H
#define MLIB_TYPES_H
@@ -32,8 +35,9 @@
#include <limits.h>
#if defined(_MSC_VER)
#include <float.h> /* for FLT_MAX and DBL_MAX */
---- openjdk.orig/jdk/src/solaris/native/java/net/Inet4AddressImpl.c
-+++ openjdk/jdk/src/solaris/native/java/net/Inet4AddressImpl.c
+diff -ru openjdk.orig/jdk/src/solaris/native/java/net/Inet4AddressImpl.c openjdk/jdk/src/solaris/native/java/net/Inet4AddressImpl.c
+--- openjdk.orig/jdk/src/solaris/native/java/net/Inet4AddressImpl.c 2014-06-12 20:14:44.000000000 +0000
++++ openjdk/jdk/src/solaris/native/java/net/Inet4AddressImpl.c 2014-07-15 07:19:52.186682096 +0000
@@ -47,7 +47,7 @@
#include "java_net_Inet4AddressImpl.h"
@@ -43,8 +47,9 @@
#define HAS_GLIBC_GETHOSTBY_R 1
#endif
---- openjdk.orig/jdk/src/solaris/native/java/net/NetworkInterface.c
-+++ openjdk/jdk/src/solaris/native/java/net/NetworkInterface.c
+diff -ru openjdk.orig/jdk/src/solaris/native/java/net/NetworkInterface.c openjdk/jdk/src/solaris/native/java/net/NetworkInterface.c
+--- openjdk.orig/jdk/src/solaris/native/java/net/NetworkInterface.c 2014-06-12 20:14:44.000000000 +0000
++++ openjdk/jdk/src/solaris/native/java/net/NetworkInterface.c 2014-07-15 07:19:52.186682096 +0000
@@ -47,7 +47,6 @@
#ifdef __linux__
@@ -53,27 +58,53 @@
#include <sys/utsname.h>
#include <stdio.h>
#endif
---- openjdk.orig/jdk/src/solaris/native/java/net/linux_close.c
-+++ openjdk/jdk/src/solaris/native/java/net/linux_close.c
-@@ -57,7 +57,7 @@
- /*
- * Signal to unblock thread
- */
+diff -ru openjdk.orig/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c
+--- openjdk.orig/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c 2014-06-12 20:14:44.000000000 +0000
++++ openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c 2014-07-15 07:19:52.190015524 +0000
+@@ -35,7 +35,6 @@
+ #endif
+ #ifdef __linux__
+ #include <unistd.h>
+-#include <sys/sysctl.h>
+ #include <sys/utsname.h>
+ #include <netinet/ip.h>
+
+diff -ru openjdk.orig/jdk/src/solaris/native/java/net/PlainSocketImpl.c openjdk/jdk/src/solaris/native/java/net/PlainSocketImpl.c
+--- openjdk.orig/jdk/src/solaris/native/java/net/PlainSocketImpl.c 2014-06-12 20:14:44.000000000 +0000
++++ openjdk/jdk/src/solaris/native/java/net/PlainSocketImpl.c 2014-07-15 07:19:52.190015524 +0000
+@@ -43,7 +43,6 @@
+ #endif
+ #ifdef __linux__
+ #include <unistd.h>
+-#include <sys/sysctl.h>
+ #endif
+
+ #include "jvm.h"
+diff -ru openjdk.orig/jdk/src/solaris/native/java/net/linux_close.c openjdk/jdk/src/solaris/native/java/net/linux_close.c
+--- openjdk.orig/jdk/src/solaris/native/java/net/linux_close.c 2014-06-12 20:14:44.000000000 +0000
++++ openjdk/jdk/src/solaris/native/java/net/linux_close.c 2014-07-15 07:22:17.609355950 +0000
+@@ -75,7 +75,7 @@
+ #ifdef _AIX
+ static int sigWakeup = (SIGRTMAX - 1);
+ #else
-static int sigWakeup = (__SIGRTMAX - 2);
+static int sigWakeup;
+ #endif
/*
- * The fd table and the number of file descriptors
-@@ -96,6 +96,7 @@
+@@ -148,6 +148,9 @@
/*
* Setup the signal handler
*/
++#ifndef __AIX
+ sigWakeup = SIGRTMAX - 2;
++#endif
sa.sa_handler = sig_wakeup;
sa.sa_flags = 0;
sigemptyset(&sa.sa_mask);
---- openjdk.orig/jdk/src/solaris/native/sun/nio/ch/NativeThread.c
-+++ openjdk/jdk/src/solaris/native/sun/nio/ch/NativeThread.c
+diff -ru openjdk.orig/jdk/src/solaris/native/sun/nio/ch/NativeThread.c openjdk/jdk/src/solaris/native/sun/nio/ch/NativeThread.c
+--- openjdk.orig/jdk/src/solaris/native/sun/nio/ch/NativeThread.c 2014-06-12 20:14:44.000000000 +0000
++++ openjdk/jdk/src/solaris/native/sun/nio/ch/NativeThread.c 2014-07-15 07:19:52.190015524 +0000
@@ -38,7 +38,7 @@
#include <sys/signal.h>
@@ -83,23 +114,3 @@
static void
nullHandler(int sig)
---- openjdk.orig/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c
-+++ openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c
-@@ -35,7 +35,6 @@
- #endif
- #ifdef __linux__
- #include <unistd.h>
--#include <sys/sysctl.h>
- #include <sys/utsname.h>
- #include <netinet/ip.h>
-
---- openjdk.orig/jdk/src/solaris/native/java/net/PlainSocketImpl.c
-+++ openjdk/jdk/src/solaris/native/java/net/PlainSocketImpl.c
-@@ -43,7 +43,6 @@
- #endif
- #ifdef __linux__
- #include <unistd.h>
--#include <sys/sysctl.h>
- #endif
-
- #include "jvm.h"