mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2026-05-04 20:06:43 +02:00
community/openjdk7: modernize
use bash for icedtea-bootstrap
This commit is contained in:
parent
a1722f1076
commit
e537e93b64
@ -90,14 +90,14 @@ builddir="$srcdir/icedtea-$_icedteaver"
|
||||
|
||||
unpack() {
|
||||
if [ -z "$force" ]; then
|
||||
verify || return 1
|
||||
initdcheck || return 1
|
||||
verify
|
||||
initdcheck
|
||||
fi
|
||||
mkdir -p "$srcdir"
|
||||
msg "Unpacking sources..."
|
||||
tar -C "$srcdir" -zxf icedtea-$_icedteaver.tar.gz || return 1
|
||||
tar -C "$srcdir" -zxf apache-ant-$ANT_VER-bin.tar.gz || return 1
|
||||
unzip -o -q "rhino-$RHINO_VER.zip" -d "$srcdir" || return 1
|
||||
tar -C "$srcdir" -zxf icedtea-$_icedteaver.tar.gz
|
||||
tar -C "$srcdir" -zxf apache-ant-$ANT_VER-bin.tar.gz
|
||||
unzip -o -q "rhino-$RHINO_VER.zip" -d "$srcdir"
|
||||
}
|
||||
|
||||
prepare() {
|
||||
@ -113,7 +113,7 @@ prepare() {
|
||||
;;
|
||||
*.patch)
|
||||
msg "Applying patch $patch"
|
||||
patch -p1 -i "$srcdir"/$patch || return 1
|
||||
patch -p1 -i "$srcdir"/$patch
|
||||
;;
|
||||
esac
|
||||
done
|
||||
@ -172,18 +172,17 @@ build() {
|
||||
--with-langtools-src-zip=$srcdir/langtools-$_dropsver.tar.bz2 \
|
||||
--with-pax=paxmark \
|
||||
--with-jdk-home=$BOOTSTRAP_JAVA_HOME \
|
||||
--with-pkgversion="Alpine ${pkgver}-r${pkgrel}" \
|
||||
|| return 1
|
||||
--with-pkgversion="Alpine ${pkgver}-r${pkgrel}"
|
||||
|
||||
msg "Icedtea boot"
|
||||
make -j1 icedtea-boot || return 1
|
||||
make -j1 icedtea-boot SHELL=/bin/bash
|
||||
msg "Icedtea boot done"
|
||||
make || return 1
|
||||
make
|
||||
}
|
||||
|
||||
package() {
|
||||
mkdir -p "$pkgdir"/$INSTALL_BASE
|
||||
cp -a "$builddir"/openjdk.build/j2sdk-image/* "$pkgdir"/$INSTALL_BASE || return 1
|
||||
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)
|
||||
@ -205,7 +204,7 @@ jrelib() {
|
||||
|
||||
local dirname=${A%/*}
|
||||
mkdir -p "$subpkgdir"/$INSTALL_BASE/$dirname
|
||||
mv "$pkgdir"/$INSTALL_BASE/$A "$subpkgdir"/$INSTALL_BASE/$dirname || return 1
|
||||
mv "$pkgdir"/$INSTALL_BASE/$A "$subpkgdir"/$INSTALL_BASE/$dirname
|
||||
done
|
||||
}
|
||||
|
||||
@ -217,11 +216,11 @@ jrebase() {
|
||||
|
||||
local A; for A in java orbd rmid servertool unpack200 keytool \
|
||||
pack200 rmiregistry tnameserv; do
|
||||
mv "$pkgdir"/$INSTALL_BASE/bin/$A "$subpkgdir"/$INSTALL_BASE/bin || return 1
|
||||
mv "$pkgdir"/$INSTALL_BASE/bin/$A "$subpkgdir"/$INSTALL_BASE/bin
|
||||
done
|
||||
|
||||
# rest of the jre subdir (which were not taken by -jre subpkg)
|
||||
mv "$pkgdir"/$INSTALL_BASE/jre "$subpkgdir"/$INSTALL_BASE || return 1
|
||||
mv "$pkgdir"/$INSTALL_BASE/jre "$subpkgdir"/$INSTALL_BASE
|
||||
|
||||
# pax mark again (due to fakeroot xattr handling bug)
|
||||
"$builddir"/pax-mark-vm "$subpkgdir"/$INSTALL_BASE
|
||||
@ -241,7 +240,7 @@ jre() {
|
||||
|
||||
local dirname=${A%/*}
|
||||
mkdir -p "$subpkgdir"/$INSTALL_BASE/$dirname
|
||||
mv "$pkgdir"/$INSTALL_BASE/$A "$subpkgdir"/$INSTALL_BASE/$dirname || return 1
|
||||
mv "$pkgdir"/$INSTALL_BASE/$A "$subpkgdir"/$INSTALL_BASE/$dirname
|
||||
done
|
||||
|
||||
# pax mark again (due to fakeroot xattr handling bug)
|
||||
@ -249,8 +248,7 @@ jre() {
|
||||
}
|
||||
|
||||
doc() {
|
||||
default_doc || return 1
|
||||
|
||||
default_doc
|
||||
mkdir -p "$subpkgdir"/$INSTALL_BASE/
|
||||
mv "$pkgdir"/$INSTALL_BASE/man "$subpkgdir"/$INSTALL_BASE/
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user