From b150300038554a7cf946e8980fdb83042d8bb4b7 Mon Sep 17 00:00:00 2001 From: Horst Burkhardt Date: Mon, 16 Sep 2024 07:26:26 +1000 Subject: bootstrap/jamvm-1.5.1: correct oversight on APKBUILD from previous commits Signed-off-by: Horst Burkhardt --- bootstrap/jamvm-1.5.1/APKBUILD | 21 +++++++++++++-------- .../jamvm-1.5.1/jamvm-1.5.1-aarch64-support.patch | 2 +- .../jamvm-1.5.1/jamvm-1.5.1-classes-location.patch | 2 +- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/bootstrap/jamvm-1.5.1/APKBUILD b/bootstrap/jamvm-1.5.1/APKBUILD index 82a3f11ee..c66c0c593 100644 --- a/bootstrap/jamvm-1.5.1/APKBUILD +++ b/bootstrap/jamvm-1.5.1/APKBUILD @@ -13,12 +13,15 @@ subpackages="$pkgname-dev" source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz $pkgname-$pkgver-classes-location.patch $pkgname-$pkgver-aarch64-support.patch - $pkgname-fpucontrol-fix.patch" + $pkgname-fpucontrol-fix.patch + $pkgname-$pkgver-san-fixes.patch + $pkgname-$pkgver-ppc64-lock.patch + " prepare() { rm -v lib/classes.zip default_prepare - autoreconf -fi + autoreconf -vif } build() { @@ -36,12 +39,14 @@ build() { package() { make DESTDIR="$pkgdir" install - ln -s /usr/bin/jamvm "$pkgdir"/usr/bin/java - ln -s /usr/bin/jikes "$pkgdir"/usr/bin/javac - ln -s /usr/bin/fastjar "$pkgdir"/usr/bin/jar + ln -s jamvm "$pkgdir"/usr/bin/java + ln -s jikes "$pkgdir"/usr/bin/javac + ln -s fastjar "$pkgdir"/usr/bin/jar } sha512sums="9f93611fefb28b5494d166d7ec9575eb8d12add775dd65b2b46303355e3f845f417d5301649a1f09cb306e6690cd82b67cb1dface30ce18d0b2ecc815d3bc9b9 jamvm-1.5.1.tar.gz -4380a95ee83bbcb076c8f19854dcd1c78fb81bc210ed2da04ce37d5977a0788debb1a3de04adff8295a6c5623e2fb2aa20739dd743f4e5b7fafaabe323189e0e jamvm-1.5.1-aarch64-support.patch -0e441916dbf66289bea37da807a85930a9fe320b5c3a5301df85a870418125fe9fe0c5fb7ce7e4baa9dfc75a3438509e9d77b0ede67b06411935875ec7e641ee jamvm-1.5.1-classes-location.patch -0ab07b96bdaae346b1bacbc7736488e357f7a959302b09d69ee038fdbf817f798ebf7cce47b79a2ed5febc688307871804eed71a278b0f499bb88eb48a897565 jamvm-fpucontrol-fix.patch" +4c2849be53d250cbccd10119e0826200b5cb893a5647d4f1e257e8fc30014d617136b406239d3b11d68bd85cdc7f34af8461bbeb0a6cb5c5367503e15b53fd30 jamvm-1.5.1-classes-location.patch +1a692e282dad56bc4408142166eef22dce314dc7014994c85a59e5ba15fdda6aded89b16e8d58c2e3afb144447d2aafe2581102dbf5cf51969531ff67768c16f jamvm-1.5.1-aarch64-support.patch +0ab07b96bdaae346b1bacbc7736488e357f7a959302b09d69ee038fdbf817f798ebf7cce47b79a2ed5febc688307871804eed71a278b0f499bb88eb48a897565 jamvm-fpucontrol-fix.patch +1c8b98946546098a8c831a875dae5d20751b2c27c68892189c5a5bc89cd5b7aed92fd37eaf8786f4d50b6443287380e614f296dd295502d1ab87866e3e4835de jamvm-1.5.1-san-fixes.patch +fbe84ee8dd9a8325965c48998b36fdfbc30f0c47b61c47ff97e630f31ce769939f1448b60bded66cdc6b5f7e884e60200ee9a30f7bb717a22ec1babe7460262d jamvm-1.5.1-ppc64-lock.patch" diff --git a/bootstrap/jamvm-1.5.1/jamvm-1.5.1-aarch64-support.patch b/bootstrap/jamvm-1.5.1/jamvm-1.5.1-aarch64-support.patch index 8867d4f19..6c35c3fa4 100644 --- a/bootstrap/jamvm-1.5.1/jamvm-1.5.1-aarch64-support.patch +++ b/bootstrap/jamvm-1.5.1/jamvm-1.5.1-aarch64-support.patch @@ -46,7 +46,7 @@ index ccd530f..707f281 100644 enable_int_inlining=yes else enable_int_inlining=no -@@ -298,6 +301,7 @@ AC_CONFIG_FILES( +@@ -299,6 +302,7 @@ AC_CONFIG_FILES( src/os/linux/x86_64/Makefile \ src/os/linux/parisc/Makefile \ src/os/linux/mips/Makefile \ diff --git a/bootstrap/jamvm-1.5.1/jamvm-1.5.1-classes-location.patch b/bootstrap/jamvm-1.5.1/jamvm-1.5.1-classes-location.patch index 57d046a81..a354029ad 100644 --- a/bootstrap/jamvm-1.5.1/jamvm-1.5.1-classes-location.patch +++ b/bootstrap/jamvm-1.5.1/jamvm-1.5.1-classes-location.patch @@ -1,7 +1,7 @@ diff -ur jamvm-1.5.0.old/configure.ac jamvm-1.5.0/configure.ac --- jamvm-1.5.0.old/configure.ac 2008-03-03 17:31:46.000000000 +0200 +++ jamvm-1.5.0/configure.ac 2008-03-03 17:36:14.000000000 +0200 -@@ -208,6 +208,7 @@ +@@ -209,6 +209,7 @@ install_dir=$prefix fi AC_DEFINE_UNQUOTED(INSTALL_DIR, "$install_dir", [Installation directory (prefix)]) -- cgit v1.2.3-70-g09d2