main/openjdk7: use paxmark, and use musl iconv

4 files changed, 4 insertions, 84 deletions

diff --git a/main/openjdk7/APKBUILD b/main/openjdk7/APKBUILD
index 8db0d508f..06403e7a7 100644
--- a/main/openjdk7/APKBUILD
+++ b/main/openjdk7/APKBUILD
@@ -5,18 +5,18 @@ _icedteaver=2.5.4
 # pkgver is <JDK version>.<JDK update>
 # check icedtea JDK when updating
 pkgver=7.75.$_icedteaver
-pkgrel=0
+pkgrel=1
 pkgdesc="Sun OpenJDK 7 via IcedTea"
 url="http://icedtea.classpath.org/"
 arch="x86 x86_64"
 license="GPL-2 with Classpath"
 depends="$pkgname-jre"
 options="sover-namecheck"
-makedepends="findutils tar zip paxctl gawk pkgconfig util-linux libxslt
+makedepends="findutils tar zip paxmark gawk pkgconfig util-linux libxslt
 	     autoconf automake linux-headers
 	     ca-certificates
 	     nss-dev cups-dev jpeg-dev giflib-dev libpng-dev libxt-dev
-	     lcms2-dev libxp-dev libxtst-dev libxinerama-dev libiconv-dev zlib-dev
+	     lcms2-dev libxp-dev libxtst-dev libxinerama-dev zlib-dev
 	     libxrender-dev alsa-lib-dev freetype-dev fontconfig-dev
 	     gtk+2.0-dev krb5-dev attr-dev"
 install=""
@@ -64,15 +64,12 @@ source="http://icedtea.classpath.org/download/source/icedtea-$_icedteaver.tar.gz
 	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
 
-	fix-paxctl-args.patch
-	icedtea-build-paxmark.patch
 	icedtea-hotspot-musl.patch
 	icedtea-hotspot-noagent-musl.patch
 	icedtea-hotspot-uclibc-fixes.patch
 	icedtea-jdk-fix-build.patch
 	icedtea-jdk-execinfo.patch
 	icedtea-jdk-fix-ipv6-init.patch
-	icedtea-jdk-iconv-uclibc.patch
 	icedtea-jdk-musl.patch
 	icedtea-jdk-no-soname.patch
 	icedtea-jdk-giflib51.patch
@@ -154,7 +151,7 @@ build() {
 		--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-pax=paxmark \
 		--with-jdk-home=$BOOTSTRAP_JAVA_HOME \
 		--with-pkgversion="Alpine ${pkgver}-r${pkgrel}" \
 		|| return 1
@@ -233,15 +230,12 @@ ffc690fecd801662d4b4f8874aecbc68  langtools-2.5.4.tar.bz2
 c3bbd2ff7bf67eae93f9c55ad3ff3b91  hotspot-2.5.4.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
 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
 66f6e66eb135f0d88847910f6581d323  icedtea-jdk-musl.patch
 d014431e70cdabb82a75e4b9ae4c28a9  icedtea-jdk-no-soname.patch
 529dd5e5372112470dacc08c95b0c22a  icedtea-jdk-giflib51.patch"
@@ -255,15 +249,12 @@ e99b65baf66d8818e3c8fd31d71fbad4ad0ceb0b7fa4c2e0607eca3a40f2ba09  jdk-2.5.4.tar.
 4825f8543aa0c065530b05b0a95915a44eea153bbb696d2ffc4b50a398813e34  hotspot-2.5.4.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
 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
 b3f82269f69483d3fe137e369f9325003ce7872d886cdf67705b434ce949b5bc  icedtea-jdk-musl.patch
 6c0bbe710395c4ced1359ab279be6a7c36da5bfb9fd60dc47d920f06a0456d82  icedtea-jdk-no-soname.patch
 77fba3032edf6cce549cd4e174d9296684b20f4589dc59179fcc8cba7426a4e9  icedtea-jdk-giflib51.patch"
@@ -277,15 +268,12 @@ d3f3cedfd1532f5a64e5ab7e0c651ca16f7c98082d7d9c7c8961f348fde9d7a1c040d6361b515812
 3a55c4052861d6f736f41264588a461e0a97a2b820016499c5e4e15601e920f5f9024519948f21a22c17d9486ae408979044700d13e97f82317135c928c22659  hotspot-2.5.4.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
 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
 44a35941c80f408d0607e32763b3b6ccee21e1d39886309327d3d74d2900117e4346ef59e77c663fd022fec10ee8f365eeb46c1260014d5765d226ce175ce3c5  icedtea-jdk-musl.patch
 bf4b184e170f7b0ff64ab30d2162784fe2bd5460d1fa31973259f7065fd4c511c46f97724fe2bd72bb94e9006cb568d0e0c87d1a9c90819e65880f8f44830bb1  icedtea-jdk-no-soname.patch
 b4a90ef63dbaec764569a671f850db42a2257b729858923a3831dafaa098c61a635462ee5c72e7fb3ddb2e54d6ee98ff69bf2b4b4f3ec9310f54caf7739e9e82  icedtea-jdk-giflib51.patch"
diff --git a/main/openjdk7/fix-paxctl-args.patch b/main/openjdk7/fix-paxctl-args.patch
deleted file mode 100644
index f9cdec3a2..000000000
--- a/main/openjdk7/fix-paxctl-args.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- icedtea-2.4.7/acinclude.m4.orig	2014-04-17 13:41:57.548895009 +0000
-+++ icedtea-2.4.7/acinclude.m4	2014-04-17 13:45:29.752728702 +0000
-@@ -2376,10 +2376,10 @@
-     AC_MSG_CHECKING([which options to pass to ${PAX_COMMAND}])
-     case "${host_cpu}" in
-       i?86)
--        PAX_COMMAND_ARGS="-msp"
-+        PAX_COMMAND_ARGS="-c -msp"
-         ;;
-       *)
--        PAX_COMMAND_ARGS="-m"
-+        PAX_COMMAND_ARGS="-c -m"
-         ;;
-     esac
-     AC_MSG_RESULT(${PAX_COMMAND_ARGS})
diff --git a/main/openjdk7/icedtea-build-paxmark.patch b/main/openjdk7/icedtea-build-paxmark.patch
deleted file mode 100644
index 46217e681..000000000
--- a/main/openjdk7/icedtea-build-paxmark.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- openjdk/make/Defs-internal.gmk.orig	2014-04-17 16:35:03.218100233 +0000
-+++ openjdk/make/Defs-internal.gmk	2014-04-17 16:35:18.085038258 +0000
-@@ -308,9 +308,9 @@
-   PAX_COMMAND = /usr/sbin/paxmark.sh
- endif
- ifeq ($(ARCH), i586)
--  PAX_COMMAND_ARGS="-msp"
-+  PAX_COMMAND_ARGS="-c -msp"
- else
--  PAX_COMMAND_ARGS="-m"
-+  PAX_COMMAND_ARGS="-c -m"
- endif
- 
- # Common make arguments (supplied to all component builds)
diff --git a/main/openjdk7/icedtea-jdk-iconv-uclibc.patch b/main/openjdk7/icedtea-jdk-iconv-uclibc.patch
deleted file mode 100644
index 68f858167..000000000
--- a/main/openjdk7/icedtea-jdk-iconv-uclibc.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: openjdk/jdk/make/java/npt/Makefile
-===================================================================
---- openjdk/jdk/make/java/npt/Makefile	2010-06-13 15:11:02.598512448 +0200
-+++ openjdk/jdk/make/java/npt/Makefile	2010-06-13 15:11:28.504759286 +0200
-@@ -65,6 +65,8 @@
- # We don't want to link against -ljava
- JAVALIB=
- 
-+LDLIBS += -liconv
-+
- # Add -export options to explicitly spell exported symbols
- ifeq ($(PLATFORM), windows)
-   OTHER_LCF += -export:nptInitialize -export:nptTerminate
-Index: icedtea6-1.8/openjdk-ecj/jdk/make/java/instrument/Makefile
-===================================================================
---- openjdk/jdk/make/java/instrument/Makefile	2010-06-13 15:12:14.688505195 +0200
-+++ openjdk/jdk/make/java/instrument/Makefile	2010-06-13 15:12:32.641425670 +0200
-@@ -123,6 +123,8 @@
- # We don't want to link against -ljava
- JAVALIB=
- 
-+LDLIBS += -liconv
-+
- #
- # Add to ambient vpath so we pick up the library files
- #
-Index: openjdk/jdk/make/sun/splashscreen/Makefile
-===================================================================
---- openjdk/jdk/make/sun/splashscreen/Makefile	2010-06-13 15:12:48.951840824 +0200
-+++ openjdk/jdk/make/sun/splashscreen/Makefile	2010-06-13 15:13:01.191422891 +0200
-@@ -55,6 +55,8 @@
- 
- JAVALIB=
- 
-+LDLIBS += -liconv
-+
- #
- # C Flags
- #