diff options
author | Timo Teräs <timo.teras@iki.fi> | 2015-04-10 12:20:08 +0000 |
---|---|---|
committer | Timo Teräs <timo.teras@iki.fi> | 2015-04-10 12:20:42 +0000 |
commit | 88a49569b688f6dca62e91b55b5ae692a8f8da57 (patch) | |
tree | b232e48c96343dd2ec5cee6c19f3e9cf5d9c5d20 /main/openjdk7 | |
parent | 609d7acd796c05a8458d898f11f3991d32d099ec (diff) | |
download | aports-88a49569b688f6dca62e91b55b5ae692a8f8da57.tar.bz2 aports-88a49569b688f6dca62e91b55b5ae692a8f8da57.tar.xz |
main/openjdk7: workaround fakeroot xattr bugs wrt/ paxmark
Diffstat (limited to 'main/openjdk7')
-rw-r--r-- | main/openjdk7/APKBUILD | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/main/openjdk7/APKBUILD b/main/openjdk7/APKBUILD index a013bfb9f8..23190b9849 100644 --- a/main/openjdk7/APKBUILD +++ b/main/openjdk7/APKBUILD @@ -5,14 +5,14 @@ _icedteaver=2.5.4 # pkgver is <JDK version>.<JDK update> # check icedtea JDK when updating pkgver=7.75.$_icedteaver -pkgrel=1 +pkgrel=2 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 paxmark gawk util-linux libxslt +makedepends="findutils tar zip file paxmark gawk util-linux libxslt autoconf automake linux-headers ca-certificates nss-dev cups-dev jpeg-dev giflib-dev libpng-dev libxt-dev @@ -163,6 +163,9 @@ package() { mkdir -p "$pkgdir"/$INSTALL_BASE cp -a "$_builddir"/openjdk.build/j2sdk-image/* "$pkgdir"/$INSTALL_BASE rm "$pkgdir"/$INSTALL_BASE/src.zip + + # pax mark again (due to fakeroot xattr handling bug) + $_builddir/pax-mark-vm "$pkgdir"/$INSTALL_BASE } jrelib() { @@ -194,6 +197,9 @@ jrebase() { # rest of the jre subdir (which were not taken by -jre subpkg) mv "$pkgdir"/$INSTALL_BASE/jre "$subpkgdir"/$INSTALL_BASE + + # pax mark again (due to fakeroot xattr handling bug) + $_builddir/pax-mark-vm "$subpkgdir"/$INSTALL_BASE } jre() { @@ -211,6 +217,9 @@ jre() { mkdir -p "$subpkgdir"/$INSTALL_BASE/$dirname mv "$pkgdir"/$INSTALL_BASE/$A "$subpkgdir"/$INSTALL_BASE/$dirname done + + # pax mark again (due to fakeroot xattr handling bug) + $_builddir/pax-mark-vm "$subpkgdir"/$INSTALL_BASE } doc() { |