Add dev-java/jamvm-2.0.0.

This commit is contained in:
Andrius Štikonas 2019-11-24 22:19:57 +00:00
parent 4f22c7a0f3
commit db398d12f2
Signed by untrusted user: andrius
GPG Key ID: E2E5CD054CB9CD3E
8 changed files with 292 additions and 1 deletions

View File

@ -1,5 +1,6 @@
DIST classpath-0.93.tar.gz 9534222 BLAKE2B 36313f25e165856a8716c18873d725d82f52e20310d2c22ca0b0b0a481e66a00ccad4138c76e96c119772565819bc06cd626bc100ddea0684d04165e10206541 SHA512 69d831361085514bb7c5607fa694914cc01bc9fe589b7744d5534c97d434722193a1b68a336642d0dba9a3b50e9acea0364741790e9f19d196e5956a51c320b0
DIST classpath-0.99.tar.gz 11078232 BLAKE2B cb62cc58b9ce75df98809298a6c6a588704a98a133e8a0378c372e6cc0e6b07c8f05d7bd23c52f2697e6a3b4bfc1f0cdfc7aa108f2f681af154e6fd8c59d9460 SHA512 d8f38677ecc6a0f4b26197ab16e9888c51043364141675ad69684828e2d0ecb93122249672e2e7997aea817cc4aac68c17ccf59bf8913afe81e9536bee6b73ac
EBUILD gnu-classpath-0.93.ebuild 1093 BLAKE2B e81893c8cda4174ed7b905f4b002eae4a69a13c16fed19f8c7db576fc79325557cb9269b3e3b9449abda834605259d9db37481fdf0d2d19cc425a9ed92bd021e SHA512 763b7345e5568f8e3a2ebb43fccf20331e12eb93fe5157835e5109bd5b42bd3774aeb1059ef74e789eaa1e24cbe48a5fb152f8c49803764a43f18fe4a37d249f
EBUILD gnu-classpath-0.99-r2.ebuild 1898 BLAKE2B 2edc5ac5c4ecbf236fac17f207a6d6396793020ca542c7b589ac914a8cf1db1abb31eb979f18b539a6bbc7e091edd0fd27330462cdb9c77610b940365249398f SHA512 bb6c247e8280b39819706cc93f0f353fc35f9d0fb257a373b0fea9c8ab95f27d65ea7624c196f9cd6cd6779f1b0b424c99ffb04ea47dfec7be6f72a33fc9b93a
EBUILD gnu-classpath-0.99-r2.ebuild 1955 BLAKE2B c647be994d7839e724d6569aa39be8a84173de2354f280f99c28992c0e69ef7c22b14e4c9e7d3593666190c5264de4699372684bf7946b96b37dfbab06cdcff3 SHA512 609127c972412a7e4090ec1807d5605f33174f9f2ed65bc7d510275a4223f1e1aba38d048eb40c38b3c7358b751c3e93d0580ab43ef235aee76b9dfd91d57b1b
EBUILD gnu-classpath-0.99_p1.ebuild 2030 BLAKE2B 52598a0950f55cdede6ac0213578e71d6b4012c150ac3fafca2c22fb3fb46117dd15d55c1892100d1b9440226c21933dcd36e40446e43e097dd2a47f2a614181 SHA512 73f37211982f940293db85351ac71c34f5f6e8e8c8d3c9857bfddefd8115d96a993aff38b6380dbb9b71b7636876db5949ea09ace5581451e4e814cf1e4e8f61
MISC metadata.xml 252 BLAKE2B a3a36edd6c0b4e630f0e38d236ff4133a5c6b4aa42f5525d8a0978ecdbbe3d53602d3fcde02cf1a495bfabb4fd06f914826df44bda7f542ce8543b32fd7bbfe2 SHA512 1ab83f56876901e45f2b34aa5c81bd1d7b243009236d238b49fca2d49ec167c596ea589de6df1c8dfe1a6b834a2e0e493409ee65d499bd2b6ecaf687ae71df69

View File

@ -69,4 +69,5 @@ src_install() {
dodoc AUTHORS BUGS ChangeLog* HACKING NEWS README THANKYOU TODO
java-pkg_regjar /usr/share/classpath/glibj.zip
java-pkg_regjar /usr/share/classpath/tools.zip
dosym /usr/libexec/gnu-classpath/gjavah /usr/bin/gjavah
}

View File

@ -1,5 +1,11 @@
AUX classes-location.patch 1184 BLAKE2B 367fad8488bf6866021aade628221a7ce53a000fc6cba0b59bbe4b2145d30a07cb6d057dcc7a4ea370f82926e0171021e50691ce35959b129802ad38d441983d SHA512 0e441916dbf66289bea37da807a85930a9fe320b5c3a5301df85a870418125fe9fe0c5fb7ce7e4baa9dfc75a3438509e9d77b0ede67b06411935875ec7e641ee
AUX jamvm-1.5.1.env 378 BLAKE2B 0d35f75ab71d3ecfd194c47eade38076cbd1856c009692e6c959712546aeb845f445914bc4005660ad4209a0faeb3327bb818a9a89b5b6e575b42da215f899b0 SHA512 c71b3a1f689778e67fd977bc7f338784868bf09d6fd0444d1b23da8abc3e8d8d93e01e85a840420c6efa89af3676327c2f1bf93dc62a2c35a7ee314542a89a41
AUX jamvm-2.0.0-classes-location.patch 1276 BLAKE2B 7e7fd91a3dcdc1eeea665517043a856bf8ab3e76d6dd91a27ea91c422555fde0c0bc853a4410bc4feb6552efae1d9ba577e39f5f9774aa2b2f601dfcb251826c SHA512 c399cb8ebce0556a778a1511fec43eeedc2e8d4b1ca732ebd201faf49d6a607baef914fb54e34f2c5b494ace6f5c072d296fb30c65038461e97a518c9e1924bd
AUX jamvm-2.0.0-env.file 545 BLAKE2B f840e4dc6b88d174714882ca7d26d14511ca1cde8414b8710063d530379fc426eb90964529940df28440fb1bc855a574b180a8e5d91d2c4bdba44e09458e9bff SHA512 50c264a5aa4f54bf79ea148c7cc42286a5dd7249629460f9d9b0c5a35ae83f30d35fe1c38e77e8b8a35e74b6f70a840558c4b08a97406b012549897f93664fe8
AUX jamvm-2.0.0-javac.in 1739 BLAKE2B ff167bfba594dbfb71dd1d09e41ce502ebfcc598fbcef0794cb967c00894745f8b16412adc7b4afbd167878defa29351e99b30a71b4377987c5c8a692f404e30 SHA512 65170b747012e114b072cd28a688089cdf2f54ddd151ba0cea92241b9b75fd0c7c410bfa4186cf9d233af4328bf962e13e8838a0cc09a1fbf2c28d29b13e36cb
AUX jamvm-2.0.0-noexecstack.patch 1387 BLAKE2B afd020772bf627c3dbd6b5da9e03d3b03e8f5c9dc3844279fe325183819cb11deadaedb4920ebfb0c6b25321daeee9f0e4fff45addd162e2b6c02e3f3ea12d31 SHA512 17c38ad0017e5659295dea7ed57f263eb0eee673bbc1f5d1e44e0c8fe588f4172a8a05c832a1fd41f3dc094779fade66aa710c8ce48c754412b0b6afdea6551a
DIST jamvm-1.5.1.tar.gz 599084 BLAKE2B af79d5615fbfa395230d93ec52fd70f6000d85eac881414f59ab9f33ab4393a4dadbfa6966c574d11422612e10354bec562b3728e4a8fe6e6334b5c0f2742ed9 SHA512 9f93611fefb28b5494d166d7ec9575eb8d12add775dd65b2b46303355e3f845f417d5301649a1f09cb306e6690cd82b67cb1dface30ce18d0b2ecc815d3bc9b9
DIST jamvm-2.0.0.tar.gz 741459 BLAKE2B 9b8b0f8cfd8f56c0b835144c07aaca709ef466fdfe5df18438d05c66cd8a07fecfebf27e1581c67658feb3674a96c2e916b85f13dc434baf2db9be4e4fbfd0cf SHA512 8ac27787ee94fa8fde962635d3c08d1dc1e5244c9d56bb693e73f3fd9b58e944ad3f7a0127afeed727d7c00d904a775d2c483157f5ac87e7eab6ecade1aad21d
EBUILD jamvm-1.5.1.ebuild 1474 BLAKE2B 0f70686930ef73e500790b457b8763f69358e10711a69933fcd319a288905da5e7953976e13e3ee911f55c609b37453857bdf8664e315609630ac5ca7e244c2d SHA512 ee945efcfb517885d3256663f40bc25f4f49557a1b828c4e3937d5e330fd7171d81408b12f8f7faf70cf8ba11cca30942fdc83458a2380a9c27168dd8a3ddacf
EBUILD jamvm-2.0.0-r99.ebuild 3980 BLAKE2B f3c21868393e7123ee2079ff3ea534312c22051a835dd68ee1945c08cfb9669c7790d256e0daea5d4047d0514c5d2b6ac6caa4392d1ac805899b1ef0df377aed SHA512 aa90d2e6a722d2deef75a2baab5234e712702c9018d2a52286e00c7e1cbc9a116ffa3b121ad14f49974877a4a1173dd46fb990b14cd3cd9c1bce9f4d25e27c8f
MISC metadata.xml 252 BLAKE2B a3a36edd6c0b4e630f0e38d236ff4133a5c6b4aa42f5525d8a0978ecdbbe3d53602d3fcde02cf1a495bfabb4fd06f914826df44bda7f542ce8543b32fd7bbfe2 SHA512 1ab83f56876901e45f2b34aa5c81bd1d7b243009236d238b49fca2d49ec167c596ea589de6df1c8dfe1a6b834a2e0e493409ee65d499bd2b6ecaf687ae71df69

View File

@ -0,0 +1,27 @@
diff -Nru jamvm-2.0.0.old/configure.ac jamvm-2.0.0/configure.ac
--- jamvm-2.0.0.old/configure.ac 2014-06-10 21:33:37.000000000 +0100
+++ jamvm-2.0.0/configure.ac 2014-11-28 19:22:12.183091414 +0000
@@ -236,6 +236,7 @@
install_dir=$prefix
fi
AC_DEFINE_UNQUOTED(INSTALL_DIR, "$install_dir", [Installation directory (prefix)])
+AC_DEFINE_UNQUOTED(PKGDATADIR, "$datadir/$PACKAGE", [Package data directory (pkgdatadir)])
AC_ARG_ENABLE(zip,
[AS_HELP_STRING(--disable-zip,turn-off zip support in the bootstrap loader)],,)
diff -Nru jamvm-2.0.0.old/src/classlib/gnuclasspath/class.c jamvm-2.0.0/src/classlib/gnuclasspath/class.c
--- jamvm-2.0.0.old/src/classlib/gnuclasspath/class.c 2012-05-17 22:01:47.000000000 +0100
+++ jamvm-2.0.0/src/classlib/gnuclasspath/class.c 2014-11-28 19:23:27.312108240 +0000
@@ -110,10 +110,10 @@
separate class files in a directory structure */
#ifdef USE_ZIP
-#define JAMVM_CLASSES INSTALL_DIR"/share/jamvm/classes.zip"
+#define JAMVM_CLASSES PKGDATADIR"/classes.zip"
#define CLASSPATH_CLASSES CLASSPATH_INSTALL_DIR"/share/classpath/glibj.zip"
#else
-#define JAMVM_CLASSES INSTALL_DIR"/share/jamvm/classes"
+#define JAMVM_CLASSES PKGDATADIR"/classes"
#define CLASSPATH_CLASSES CLASSPATH_INSTALL_DIR"/share/classpath"
#endif

View File

@ -0,0 +1,15 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
VERSION="JamVM JDK @PV@"
JAVA_HOME="@GENTOO_PORTAGE_EPREFIX@/usr/@LIBDIR@/@PN@-jdk"
JDK_HOME="@GENTOO_PORTAGE_EPREFIX@/usr/@LIBDIR@/@PN@-jdk"
BOOTCLASSPATH="@GENTOO_PORTAGE_EPREFIX@/usr/@LIBDIR@/@PN@/classes2.zip:${JAVA_HOME}/lib/rt.jar"
JAVAC="${JAVA_HOME}/bin/javac"
PATH="${JAVA_HOME}/bin"
ROOTPATH="${JAVA_HOME}/bin"
PROVIDES_TYPE="JRE"
PROVIDES_VERSION="1.5"
GENERATION="2"
ENV_VARS="JAVA_HOME JAVAC PATH"
LDPATH="${JAVA_HOME}/lib"

View File

@ -0,0 +1,57 @@
#!/usr/bin/perl -w
use strict;
use constant NO_DUP_ARGS => qw(-source -target -d -encoding);
use constant STRIP_ARGS => qw(-Werror -implicit:none -J-Xbootclasspath/p:);
my $ECJ_WARNINGS="-nowarn";
my ( @bcoption, @source15, @target15, @cp );
push @bcoption, '-bootclasspath', '@RT_JAR@:@TOOLS_JAR@'
unless grep {$_ eq '-bootclasspath'} @ARGV;
push @source15, '-source', '1.5'
unless grep {$_ eq '-source'} @ARGV;
push @target15, '-target', '1.5'
unless grep {$_ eq '-target'} @ARGV;
push @cp, '-cp', '.'
unless grep {$_ =~ '\-c(p|lasspath)'} @ARGV or $ENV{CLASSPATH};
my @ecj_parms = ($ECJ_WARNINGS, @bcoption, @source15, @target15, @cp);
# Work around ecj's inability to handle duplicate command-line
# options and unknown javac options.
sub gen_ecj_opts
{
my @new_args = @{$_[0]};
for my $opt (NO_DUP_ARGS)
{
my @indices = reverse grep {$new_args[$_] eq $opt} 0..$#new_args;
if (@indices > 1) {
shift @indices; # keep last instance only
splice @new_args, $_, 2 for @indices;
}
}
for my $opt (STRIP_ARGS)
{
my @indices = reverse grep {$new_args[$_] eq $opt} 0..$#new_args;
splice @new_args, $_, 1 for @indices;
}
return \@new_args;
}
sub split_vm_args
{
my @new_args = @{$_[0]};
my @vm_args = map { substr $_, 2 } grep $_ =~ /^-J/, @new_args;
my @javac_args = grep $_ !~ /^-J/, @new_args;
return (\@vm_args, \@javac_args);
}
my ($vm_args, $javac_args) = split_vm_args (gen_ecj_opts( \@ARGV ));
my @CLASSPATH = ('@ECJ_JAR@');
push @CLASSPATH, split /:/, $ENV{"CLASSPATH"} if exists $ENV{"CLASSPATH"};
$ENV{"CLASSPATH"} = join ':', @CLASSPATH;
exec '@JAVA@', @$vm_args, 'org.eclipse.jdt.internal.compiler.batch.Main', @ecj_parms, @$javac_args;

View File

@ -0,0 +1,48 @@
diff --git a/src/os/linux/arm/callNative.S b/src/os/linux/arm/callNative.S
index 245afd1..1583023 100644
--- a/src/os/linux/arm/callNative.S
+++ b/src/os/linux/arm/callNative.S
@@ -36,3 +36,7 @@
#include "callNativeOABI.S"
#endif
#endif
+
+#if defined(__linux__) && defined(__ELF__)
+.section .note.GNU-stack,"",%progbits
+#endif
diff --git a/src/os/linux/mips/callNative.S b/src/os/linux/mips/callNative.S
index cede343..90d9163 100644
--- a/src/os/linux/mips/callNative.S
+++ b/src/os/linux/mips/callNative.S
@@ -184,3 +184,7 @@ return:
j $31
.end callJNIMethod
#endif
+
+#if defined(__linux__) && defined(__ELF__)
+.section .note.GNU-stack,"",%progbits
+#endif
diff --git a/src/os/linux/powerpc/callNative.S b/src/os/linux/powerpc/callNative.S
index aa47f6a..763dc0a 100644
--- a/src/os/linux/powerpc/callNative.S
+++ b/src/os/linux/powerpc/callNative.S
@@ -281,3 +281,7 @@ return:
mr 1,11
blr
#endif
+
+#if defined(__linux__) && defined(__ELF__)
+.section .note.GNU-stack,"",%progbits
+#endif
diff --git a/src/os/linux/x86_64/callNative.S b/src/os/linux/x86_64/callNative.S
index 26404e6..9fb5cdf 100644
--- a/src/os/linux/x86_64/callNative.S
+++ b/src/os/linux/x86_64/callNative.S
@@ -267,3 +267,7 @@ float_ret:
addq $8, %rcx
jmp return
#endif
+
+#if defined(__linux__) && defined(__ELF__)
+.section .note.GNU-stack,"",%progbits
+#endif

View File

@ -0,0 +1,136 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
inherit eutils flag-o-matic multilib java-vm-2 autotools
DESCRIPTION="An extremely small and specification-compliant virtual machine"
HOMEPAGE="http://jamvm.sourceforge.net/"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64"
IUSE="libffi"
DEPEND="dev-java/gnu-classpath:0.93
dev-java/eclipse-ecj:3.2
libffi? ( virtual/libffi )
ppc64? ( virtual/libffi )
sparc? ( virtual/libffi )"
RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}"/"${P}-classes-location.patch"
"${FILESDIR}"/"${P}-noexecstack.patch"
)
src_prepare() {
# without this patch, classes.zip is not found at runtime
epatch "${PATCHES[@]}"
eautoreconf
# These come precompiled.
# configure script uses detects the compiler
# from PATH. I guess we should compile this from source.
# Then just make sure not to hit
# https://bugs.gentoo.org/show_bug.cgi?id=163801
#
rm -v src/classlib/gnuclasspath/lib/classes.zip || die
}
src_configure() {
export CLASSPATH=/usr/share/classpath/glibj.zip
export JAVAC="${EPREFIX}/usr/bin/ecj-3.2"
filter-flags "-fomit-frame-pointer"
if use ppc64 || use sparc || use libffi; then
append-cflags "$(pkg-config --cflags-only-I libffi)"
fi
local fficonf="--enable-ffi"
if { ! use ppc64 && ! use sparc; }; then
fficonf="$(use_enable libffi ffi)"
fi
econf ${fficonf} \
--disable-dependency-tracking \
--libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \
--includedir="${EPREFIX}"/usr/include/${PN} \
--with-classpath-install-dir=/usr/share/classpath
}
src_compile() {
export LD_LIBRARY_PATH=/usr/$(get_libdir)/classpath
default
}
create_launcher() {
local script="${D}/${INSTALL_DIR}/bin/${1}"
cat > "${script}" <<-EOF
#!/bin/sh
exec /usr/bin/jamvm \
-Xbootclasspath/p:/usr/share/classpath/tools.zip" \
gnu.classpath.tools.${1}.Main "\$@"
EOF
chmod +x "${script}" || die
}
src_install() {
local libdir=$(get_libdir)
local CLASSPATH_DIR=/usr/libexec/gnu-classpath-0.98
local JDK_DIR=/usr/${libdir}/${PN}-jdk
emake DESTDIR="${D}" install
dodoc ACKNOWLEDGEMENTS AUTHORS ChangeLog NEWS README
set_java_env "${FILESDIR}/${P}-env.file"
dodir ${JDK_DIR}/bin
dosym /usr/bin/jamvm2 ${JDK_DIR}/bin/java
for files in ${CLASSPATH_DIR}/g*; do
if [ $files = "${CLASSPATH_DIR}/bin/gjdoc" ] ; then
dosym $files ${JDK_DIR}/bin/javadoc || die
else
dosym $files \
${JDK_DIR}/bin/$(echo $files|sed "s#$(dirname $files)/g##") || die
fi
done
dodir ${JDK_DIR}/jre/lib
dosym /usr/share/classpath/glibj.zip ${JDK_DIR}/jre/lib/rt.jar
dodir ${JDK_DIR}/lib
dosym /usr/share/classpath/tools.zip ${JDK_DIR}/lib/tools.jar
local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)"
exeinto ${JDK_DIR}/bin
sed -e "s#@JAVA@#/usr/bin/jamvm#" \
-e "s#@ECJ_JAR@#${ecj_jar}#" \
-e "s#@RT_JAR@#/usr/share/classpath/glibj.zip#" \
-e "s#@TOOLS_JAR@#/usr/share/classpath/tools.zip#" \
"${FILESDIR}"/"${P}-javac.in" | newexe - javac
local libarch="${ARCH}"
[ ${ARCH} == x86 ] && libarch="i386"
[ ${ARCH} == x86_64 ] && libarch="amd64"
dodir ${JDK_DIR}/jre/lib/${libarch}/client
dodir ${JDK_DIR}/jre/lib/${libarch}/server
dosym /usr/${libdir}/${PN}/libjvm.so ${JDK_DIR}/jre/lib/${libarch}/client/libjvm.so
dosym /usr/${libdir}/${PN}/libjvm.so ${JDK_DIR}/jre/lib/${libarch}/server/libjvm.so
dosym /usr/${libdir}/classpath/libjawt.so ${JDK_DIR}/jre/lib/${libarch}/libjawt.so
# Can't use java-vm_set-pax-markings as doesn't work with symbolic links
# Ensure a PaX header is created.
local pax_markings="C"
# Usually disabling MPROTECT is sufficient.
local pax_markings+="m"
# On x86 for heap sizes over 700MB disable SEGMEXEC and PAGEEXEC as well.
use x86 && pax_markings+="sp"
pax-mark ${pax_markings} "${ED}"/usr/bin/jamvm
mv "${ED}"/usr/bin/jamvm "${ED}"/usr/bin/jamvm2
mv "${ED}"/usr/share/jamvm/classes.zip "${ED}"/usr/share/jamvm/classes2.zip
}