From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- dev-java/jamvm/Manifest | 9 ++ .../jamvm/files/jamvm-2.0.0-classes-location.patch | 27 +++++ dev-java/jamvm/files/jamvm-2.0.0-env.file | 15 +++ dev-java/jamvm/files/jamvm-2.0.0-javac.in | 57 +++++++++ dev-java/jamvm/files/jamvm-2.0.0-noexecstack.patch | 48 ++++++++ dev-java/jamvm/jamvm-2.0.0-r1.ebuild | 127 +++++++++++++++++++++ dev-java/jamvm/metadata.xml | 11 ++ 7 files changed, 294 insertions(+) create mode 100644 dev-java/jamvm/Manifest create mode 100644 dev-java/jamvm/files/jamvm-2.0.0-classes-location.patch create mode 100644 dev-java/jamvm/files/jamvm-2.0.0-env.file create mode 100644 dev-java/jamvm/files/jamvm-2.0.0-javac.in create mode 100644 dev-java/jamvm/files/jamvm-2.0.0-noexecstack.patch create mode 100644 dev-java/jamvm/jamvm-2.0.0-r1.ebuild create mode 100644 dev-java/jamvm/metadata.xml (limited to 'dev-java/jamvm') diff --git a/dev-java/jamvm/Manifest b/dev-java/jamvm/Manifest new file mode 100644 index 000000000000..4fd4bc687b86 --- /dev/null +++ b/dev-java/jamvm/Manifest @@ -0,0 +1,9 @@ +AUX jamvm-2.0.0-classes-location.patch 1276 SHA256 98ecad3eeb0623b3dc01155c9cbd9aacf31e5d5854b183a7be11b64bfdd838a6 SHA512 c399cb8ebce0556a778a1511fec43eeedc2e8d4b1ca732ebd201faf49d6a607baef914fb54e34f2c5b494ace6f5c072d296fb30c65038461e97a518c9e1924bd WHIRLPOOL 91d9c75a260f6f5943d1221bfba77032fc1ce1f8d85217ec4a80aa50b826f36816aa4fe0e1a2ae7cb27c171ec029d8ee3ad512a506c1d31e02276a02b1858e42 +AUX jamvm-2.0.0-env.file 544 SHA256 4ba42be3bdb4ba71d4a1412338e8d337df5478e8604ccb5510ba4b359a325594 SHA512 bf79384865e1bcaeff6c9b11d4b7d2cbd3740e87e83470f62c5ecc69029d3eaa876c5d69a376175f703d6a169041589b8c552cfe9f136be4d3050ea1888a771a WHIRLPOOL b4021326eea003cb0b9bda13ecf93b50a5f839cba6090c6a7056f205346d1f9596ec4b831c702fac1532935987f15803570d66ffed1d32e7b76728f35fd369fa +AUX jamvm-2.0.0-javac.in 1739 SHA256 3bb23cff0a6e5a7a820e19cce4b9b0f51a7b84ee9e0eeb048b463a5f3e996db0 SHA512 65170b747012e114b072cd28a688089cdf2f54ddd151ba0cea92241b9b75fd0c7c410bfa4186cf9d233af4328bf962e13e8838a0cc09a1fbf2c28d29b13e36cb WHIRLPOOL 2237edd6abffdfb762d178e611768396f0b93a38f8a70f83c986049b60e26bb7084e3a38b70ed29c09df739091cdbfbfdd688e5eccee6ca4ea4006c23cf2b7d8 +AUX jamvm-2.0.0-noexecstack.patch 1387 SHA256 6a6028e55532ba3debf1f170790cc609b0bbd0cfe7fd7b5a14f4513e6b46873b SHA512 17c38ad0017e5659295dea7ed57f263eb0eee673bbc1f5d1e44e0c8fe588f4172a8a05c832a1fd41f3dc094779fade66aa710c8ce48c754412b0b6afdea6551a WHIRLPOOL e06573fa48c98c29ae1f53ce19b511f21ee594d32c840a4649d3a6df7754e594e729551429610c4d04d5dc97aa42678a35e68fb17709125e60ae2c53c51c9fd4 +DIST jamvm-2.0.0.tar.gz 741459 SHA256 76428e96df0ae9dd964c7a7c74c1e9a837e2f312c39e9a357fa8178f7eff80da SHA512 8ac27787ee94fa8fde962635d3c08d1dc1e5244c9d56bb693e73f3fd9b58e944ad3f7a0127afeed727d7c00d904a775d2c483157f5ac87e7eab6ecade1aad21d WHIRLPOOL 7e80be683fafb444cd417502b96089ce4f6879a049ca49e33691b4d5d6755814654ab4ed7626b666dd48f9d6101567b2a12de43b916055ea1d067c5d4df06443 +EBUILD jamvm-2.0.0-r1.ebuild 3701 SHA256 84048039ec3942696d8dd6c07a75132da66a445f7408a28df22fff25e68da515 SHA512 96967a52414796749f5bce41695d8db746d2bbe720c968c15a3db6977d9b2ac4a72de508a2512457d04a9326af5d9cb2ceecd707427a845a17a651e39a4d07d9 WHIRLPOOL 0d45b414e3867c805e7c829bc6cc17d700ab140b93a206402ee132a61c7c74b021f2cf8d1f808977556460404d6c07a1851547c94603cb2f6d0d9d405bcd71f5 +MISC ChangeLog 4312 SHA256 265172c26605720bf85007b024fbab92ab8debc3265c625409ff75d884f1bd6d SHA512 b7241c9d23c79aaee40ce261883dd82e83f60ee3cffb2cfc94225ad5825da18bce318003da00965b1df4411ef3dd46ee3a1cb890d4c2e7b0c2c5bb0238b3ca0c WHIRLPOOL df768edfff94f7010d405e6773470b37317942b8bd73588e22c7b84b4f4541af002ae336fc765f1bf36ea0213385fa55b1b0cc485e50cca7f0fdb0cf91b69095 +MISC ChangeLog-2015 7768 SHA256 39b543f954b809f83f49b75c835a8a3aae6d9d34ac7981da953619e4dcd6a407 SHA512 fbb36c8ede4a8b39da6c97af537f73b59d348de6f89343ce39f8ba47e199c0e2eed4abf657fbd76fbf427f99307f4b6710998854eaf9f3174ebced8981088a87 WHIRLPOOL aab271a43cb56b4bb05a7c958604c118b919bc4efecbee627ccf0861893e91648e91c2a414dd0909ee184657a7510324906e3e377e7f0062aa6dec5bbb31e78b +MISC metadata.xml 311 SHA256 d1c61c433be3de320b6ad194940b3e86de437e2f004bf7eb69d718b1267c69cf SHA512 3c73e7134e8adf35e0a1418dfcb0215082b5cfc7e3baabc11d89fb1044996a382c551309e5c04dbc54257a65173384b690ad951ceaec2b8569d89bb8a5e757ee WHIRLPOOL 7fa252078e65cf175004917b0bb6abfa85212e0d77084378a696562c80a93f02f60fffcf899cf85c873a21dcdb77515100d8198e0d3e3075dfcea44f28850edd diff --git a/dev-java/jamvm/files/jamvm-2.0.0-classes-location.patch b/dev-java/jamvm/files/jamvm-2.0.0-classes-location.patch new file mode 100644 index 000000000000..6cf7611f1f35 --- /dev/null +++ b/dev-java/jamvm/files/jamvm-2.0.0-classes-location.patch @@ -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 + diff --git a/dev-java/jamvm/files/jamvm-2.0.0-env.file b/dev-java/jamvm/files/jamvm-2.0.0-env.file new file mode 100644 index 000000000000..1b92cd02bb79 --- /dev/null +++ b/dev-java/jamvm/files/jamvm-2.0.0-env.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@/classes.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" diff --git a/dev-java/jamvm/files/jamvm-2.0.0-javac.in b/dev-java/jamvm/files/jamvm-2.0.0-javac.in new file mode 100644 index 000000000000..8eeda68c7a5e --- /dev/null +++ b/dev-java/jamvm/files/jamvm-2.0.0-javac.in @@ -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; diff --git a/dev-java/jamvm/files/jamvm-2.0.0-noexecstack.patch b/dev-java/jamvm/files/jamvm-2.0.0-noexecstack.patch new file mode 100644 index 000000000000..2a0f14c71a1e --- /dev/null +++ b/dev-java/jamvm/files/jamvm-2.0.0-noexecstack.patch @@ -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 diff --git a/dev-java/jamvm/jamvm-2.0.0-r1.ebuild b/dev-java/jamvm/jamvm-2.0.0-r1.ebuild new file mode 100644 index 000000000000..b418c899262f --- /dev/null +++ b/dev-java/jamvm/jamvm-2.0.0-r1.ebuild @@ -0,0 +1,127 @@ +# 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 x86" +IUSE="debug libffi" + +DEPEND="dev-java/gnu-classpath:0.98 + || ( dev-java/eclipse-ecj:* dev-java/ecj-gcj:* ) + 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 lib/classes.zip || die +} + +src_configure() { + 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 \ + $(use_enable debug trace) \ + --libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \ + --includedir="${EPREFIX}"/usr/include/${PN} \ + --with-classpath-install-dir=/usr +} + +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/jamvm ${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" + # Usally disabeling MPROTECT is sufficent. + 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 +} diff --git a/dev-java/jamvm/metadata.xml b/dev-java/jamvm/metadata.xml new file mode 100644 index 000000000000..991f28de07c6 --- /dev/null +++ b/dev-java/jamvm/metadata.xml @@ -0,0 +1,11 @@ + + + + + java@gentoo.org + Java + + + jamvm + + -- cgit v1.2.3