Merge branch 'master' into zfs

1 files changed, 6 insertions, 22 deletions

diff --git a/user/openjdk8/APKBUILD b/user/openjdk8/APKBUILD
index 4861c4f9b..4ad8f07a0 100644
--- a/user/openjdk8/APKBUILD
+++ b/user/openjdk8/APKBUILD
@@ -8,9 +8,9 @@ pkgrel=0
 pkgdesc="Libre Java development kit for Java 8"
 url="https://icedtea.classpath.org/"
 arch="all"
+options="sover-namecheck"
 license="GPL-2.0-only"
 depends="$pkgname-jre java-cacerts"
-options="sover-namecheck"
 makedepends="bash findutils libarchive-tools zip file util-linux libxslt
 	autoconf automake linux-headers sed xz coreutils
 	openjdk7 ca-certificates libjpeg-turbo-dev cmd:which
@@ -102,17 +102,15 @@ unpack() {
 }
 
 prepare() {
-	cd "$builddir"
-
-	local ver_u="$(sed -En 's/^\s*JDK_UPDATE_VERSION\s*=\s*(\S+).*/\1/p' acinclude.m4)"
-	local ver_b="$(sed -En 's/^\s*BUILD_VERSION\s*=\s*b(\S+).*/\1/p' acinclude.m4)"
+	ver_u="$(sed -En 's/^\s*JDK_UPDATE_VERSION\s*=\s*(\S+).*/\1/p' acinclude.m4)"
+	ver_b="$(sed -En 's/^\s*BUILD_VERSION\s*=\s*b(\S+).*/\1/p' acinclude.m4)"
 	[ "${pkgver#*.}" = "$ver_u.$ver_b" ] \
 		|| die "Version mismatch, source is 8.$ver_u.$ver_b, but abuild defines $pkgver!"
 
 	# Busybox sha256 does not support longopts.
 	sed -e "s/--check/-c/g" -i Makefile.am
 
-	local patch; for patch in $source; do
+	for patch in $source; do
 		case $patch in
 		icedtea-*.patch)
 			cp ../$patch patches
@@ -136,7 +134,7 @@ build() {
 	fi
 
 	DISTRIBUTION_PATCHES=""
-	local patch; for patch in $source; do
+	for patch in $source; do
 		case $patch in
 		icedtea-*.patch)
 			DISTRIBUTION_PATCHES="$DISTRIBUTION_PATCHES patches/$patch"
@@ -146,7 +144,6 @@ build() {
 	export DISTRIBUTION_PATCHES
 	echo "icedtea patches: $DISTRIBUTION_PATCHES"
 
-	cd "$builddir"
 	bash ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -183,8 +180,6 @@ check() {
 }
 
 package() {
-	cd "$builddir"
-
 	mkdir -p "$pkgdir"/$_java_home
 
 	cp -a openjdk.build/images/j2sdk-image/* "$pkgdir"/$_java_home/
@@ -195,9 +190,6 @@ package() {
 	# running `java -Xshare:dump`.
 	rm -f "$pkgdir"/$_jrelib/server/classes.jsa
 
-	# pax mark again (due to fakeroot xattr handling bug)
-	./pax-mark-vm "$pkgdir"/$_java_home true
-
 	# symlink to shared java cacerts store
 	rm -f "$pkgdir"/$_java_home/jre/lib/security/cacerts
 	ln -sf /etc/ssl/certs/java/cacerts \
@@ -208,7 +200,6 @@ jrelib() {
 	pkgdesc="OpenJDK 8 Java Runtime (class libraries)"
 	depends=""
 
-	local file dir
 	for file in jre/lib/images \
 			jre/lib/*.jar \
 			jre/lib/security \
@@ -226,7 +217,6 @@ jrelib() {
 
 jre() {
 	pkgdesc="OpenJDK 8 Java Runtime"
-	local file dir
 
 	mkdir -p "$subpkgdir"
 	for file in jre/bin/policytool \
@@ -242,9 +232,6 @@ jre() {
 		mkdir -p "$subpkgdir"/$_java_home/$dir
 		mv "$pkgdir"/$_java_home/$file "$subpkgdir"/$_java_home/$dir
 	done
-
-	# Pax mark again (due to fakeroot xattr handling bug).
-	"$builddir"/pax-mark-vm "$subpkgdir"/$_java_home true
 }
 
 jrebase() {
@@ -257,16 +244,13 @@ jrebase() {
 	mv "$pkgdir"/$_java_home/lib/$_jarch/jli \
 		"$subpkgdir"/$_java_home/lib/$_jarch/
 
-	local file; for file in java orbd rmid servertool unpack200 keytool \
+	for file in java orbd rmid servertool unpack200 keytool \
 			pack200 rmiregistry tnameserv; do
 		mv "$pkgdir"/$_java_home/bin/$file "$subpkgdir"/$_java_home/bin/
 	done
 
 	# Rest of the jre subdir (which were not taken by -jre subpkg).
 	mv "$pkgdir"/$_java_home/jre "$subpkgdir"/$_java_home/
-
-	# Pax mark again (due to fakeroot xattr handling bug).
-	"$builddir"/pax-mark-vm "$subpkgdir"/$_java_home true
 }
 
 doc() {