* [gentoo-commits] repo/gentoo:master commit in: dev-java/jamvm/files/, dev-java/jamvm/
@ 2015-10-24 9:03 Patrice Clement
0 siblings, 0 replies; 3+ messages in thread
From: Patrice Clement @ 2015-10-24 9:03 UTC (permalink / raw
To: gentoo-commits
commit: 3143fb5765cc33ed3e48afcf577971a2e5cbafd4
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 23 19:34:08 2015 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sat Oct 24 09:01:34 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3143fb57
dev-java/jamvm: Version bump. Fixes bug 539734.
Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
dev-java/jamvm/Manifest | 1 +
dev-java/jamvm/files/classes-location.patch | 16 ++--
dev-java/jamvm/files/jamvm.env | 16 ++++
dev-java/jamvm/files/javac.in | 57 +++++++++++++
dev-java/jamvm/files/noexecstack.patch | 48 +++++++++++
dev-java/jamvm/jamvm-2.0.0-r1.ebuild | 124 ++++++++++++++++++++++++++++
6 files changed, 254 insertions(+), 8 deletions(-)
diff --git a/dev-java/jamvm/Manifest b/dev-java/jamvm/Manifest
index 99424ee..144c16d 100644
--- a/dev-java/jamvm/Manifest
+++ b/dev-java/jamvm/Manifest
@@ -1 +1,2 @@
DIST jamvm-1.5.4.tar.gz 656283 SHA256 7865693698bc4322cabe1014a4b7ebdec1bc1daf45f1a4457b6e908a4446b124 SHA512 a4a7a2917881262fee19b6aedd9dc50a78463c5e4b02bda4b8184aef49797e3476f8ec8671047a01ba246af7d84cbe58f57ee84bb198817738c79d9f62c1ddbc WHIRLPOOL 615d94ab3a8359c8d6d0a2347d836c0a6adceaeda03a72d105b094f4ffb3161a5f3abbd4c12aa75703823da203d1cee91591e829a796813f82fcfbf2703068f2
+DIST jamvm-2.0.0.tar.gz 741459 SHA256 76428e96df0ae9dd964c7a7c74c1e9a837e2f312c39e9a357fa8178f7eff80da SHA512 8ac27787ee94fa8fde962635d3c08d1dc1e5244c9d56bb693e73f3fd9b58e944ad3f7a0127afeed727d7c00d904a775d2c483157f5ac87e7eab6ecade1aad21d WHIRLPOOL 7e80be683fafb444cd417502b96089ce4f6879a049ca49e33691b4d5d6755814654ab4ed7626b666dd48f9d6101567b2a12de43b916055ea1d067c5d4df06443
diff --git a/dev-java/jamvm/files/classes-location.patch b/dev-java/jamvm/files/classes-location.patch
index 57d046a..6cf7611 100644
--- a/dev-java/jamvm/files/classes-location.patch
+++ b/dev-java/jamvm/files/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 @@
+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)])
@@ -9,10 +9,10 @@ diff -ur jamvm-1.5.0.old/configure.ac jamvm-1.5.0/configure.ac
AC_ARG_ENABLE(zip,
[AS_HELP_STRING(--disable-zip,turn-off zip support in the bootstrap loader)],,)
-diff -ur jamvm-1.5.0.old/src/class.h jamvm-1.5.0/src/class.h
---- jamvm-1.5.0.old/src/class.h 2008-03-03 17:31:46.000000000 +0200
-+++ jamvm-1.5.0/src/class.h 2008-03-03 17:36:51.000000000 +0200
-@@ -39,10 +39,10 @@
+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
diff --git a/dev-java/jamvm/files/jamvm.env b/dev-java/jamvm/files/jamvm.env
new file mode 100644
index 0000000..5eee6a9
--- /dev/null
+++ b/dev-java/jamvm/files/jamvm.env
@@ -0,0 +1,16 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/javac.in b/dev-java/jamvm/files/javac.in
new file mode 100644
index 0000000..8eeda68
--- /dev/null
+++ b/dev-java/jamvm/files/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/noexecstack.patch b/dev-java/jamvm/files/noexecstack.patch
new file mode 100644
index 0000000..2a0f14c
--- /dev/null
+++ b/dev-java/jamvm/files/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 0000000..65eeb61
--- /dev/null
+++ b/dev-java/jamvm/jamvm-2.0.0-r1.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~ppc ~ppc ~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}"
+
+src_prepare() {
+ # without this patch, classes.zip is not found at runtime
+ epatch "${FILESDIR}/classes-location.patch"
+ epatch "${FILESDIR}/noexecstack.patch"
+ 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}"
+}
+
+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}/${PN}.env"
+
+ 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
+ cat "${FILESDIR}"/javac.in | 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#" \
+ | 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
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jamvm/files/, dev-java/jamvm/
@ 2015-10-24 17:29 Patrice Clement
0 siblings, 0 replies; 3+ messages in thread
From: Patrice Clement @ 2015-10-24 17:29 UTC (permalink / raw
To: gentoo-commits
commit: fa3b219107c4ef1f841702ddfa35f1b6d2f66e9e
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 24 17:25:42 2015 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sat Oct 24 17:26:03 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa3b2191
dev-java/jamvm: Sort out patch naming convention. Fixes bug 563988.
Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
...location.patch => jamvm-1.5.4-classes-location.patch} | 16 ++++++++--------
.../files/{jamvm-1.5.4-r2.env => jamvm-1.5.4-env.file} | 0
...location.patch => jamvm-2.0.0-classes-location.patch} | 0
dev-java/jamvm/files/{jamvm.env => jamvm-2.0.0-env.file} | 0
dev-java/jamvm/files/{javac.in => jamvm-2.0.0-javac.in} | 0
.../{noexecstack.patch => jamvm-2.0.0-noexecstack.patch} | 0
dev-java/jamvm/jamvm-1.5.4-r2.ebuild | 8 ++++++--
dev-java/jamvm/jamvm-2.0.0-r1.ebuild | 16 ++++++++++------
8 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/dev-java/jamvm/files/classes-location.patch b/dev-java/jamvm/files/jamvm-1.5.4-classes-location.patch
similarity index 59%
copy from dev-java/jamvm/files/classes-location.patch
copy to dev-java/jamvm/files/jamvm-1.5.4-classes-location.patch
index 6cf7611..57d046a 100644
--- a/dev-java/jamvm/files/classes-location.patch
+++ b/dev-java/jamvm/files/jamvm-1.5.4-classes-location.patch
@@ -1,7 +1,7 @@
-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 @@
+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 @@
install_dir=$prefix
fi
AC_DEFINE_UNQUOTED(INSTALL_DIR, "$install_dir", [Installation directory (prefix)])
@@ -9,10 +9,10 @@ diff -Nru jamvm-2.0.0.old/configure.ac jamvm-2.0.0/configure.ac
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 @@
+diff -ur jamvm-1.5.0.old/src/class.h jamvm-1.5.0/src/class.h
+--- jamvm-1.5.0.old/src/class.h 2008-03-03 17:31:46.000000000 +0200
++++ jamvm-1.5.0/src/class.h 2008-03-03 17:36:51.000000000 +0200
+@@ -39,10 +39,10 @@
separate class files in a directory structure */
#ifdef USE_ZIP
diff --git a/dev-java/jamvm/files/jamvm-1.5.4-r2.env b/dev-java/jamvm/files/jamvm-1.5.4-env.file
similarity index 100%
rename from dev-java/jamvm/files/jamvm-1.5.4-r2.env
rename to dev-java/jamvm/files/jamvm-1.5.4-env.file
diff --git a/dev-java/jamvm/files/classes-location.patch b/dev-java/jamvm/files/jamvm-2.0.0-classes-location.patch
similarity index 100%
rename from dev-java/jamvm/files/classes-location.patch
rename to dev-java/jamvm/files/jamvm-2.0.0-classes-location.patch
diff --git a/dev-java/jamvm/files/jamvm.env b/dev-java/jamvm/files/jamvm-2.0.0-env.file
similarity index 100%
rename from dev-java/jamvm/files/jamvm.env
rename to dev-java/jamvm/files/jamvm-2.0.0-env.file
diff --git a/dev-java/jamvm/files/javac.in b/dev-java/jamvm/files/jamvm-2.0.0-javac.in
similarity index 100%
rename from dev-java/jamvm/files/javac.in
rename to dev-java/jamvm/files/jamvm-2.0.0-javac.in
diff --git a/dev-java/jamvm/files/noexecstack.patch b/dev-java/jamvm/files/jamvm-2.0.0-noexecstack.patch
similarity index 100%
rename from dev-java/jamvm/files/noexecstack.patch
rename to dev-java/jamvm/files/jamvm-2.0.0-noexecstack.patch
diff --git a/dev-java/jamvm/jamvm-1.5.4-r2.ebuild b/dev-java/jamvm/jamvm-1.5.4-r2.ebuild
index 163773a..03dccea 100644
--- a/dev-java/jamvm/jamvm-1.5.4-r2.ebuild
+++ b/dev-java/jamvm/jamvm-1.5.4-r2.ebuild
@@ -21,9 +21,13 @@ DEPEND="dev-java/gnu-classpath:${CLASSPATH_SLOT}
amd64? ( virtual/libffi )"
RDEPEND="${DEPEND}"
+PATCHES=(
+ "${FILESDIR}"/"${P}-classes-location.patch"
+)
+
src_prepare() {
# without this patch, classes.zip is not found at runtime
- epatch "${FILESDIR}/classes-location.patch"
+ epatch "${PATCHES[@]}"
eautoreconf
# These come precompiled.
@@ -76,7 +80,7 @@ src_install() {
dodoc ACKNOWLEDGEMENTS AUTHORS ChangeLog NEWS README
- set_java_env "${FILESDIR}/${PN}-1.5.4-r2.env"
+ set_java_env "${FILESDIR}/${P}-env.file"
dosym /usr/bin/jamvm ${INSTALL_DIR}/bin/java
dosym ${CLASSPATH_DIR}/share/classpath/glibj.zip ${INSTALL_DIR}/jre/lib/rt.jar
diff --git a/dev-java/jamvm/jamvm-2.0.0-r1.ebuild b/dev-java/jamvm/jamvm-2.0.0-r1.ebuild
index 65eeb61..878fd1b 100644
--- a/dev-java/jamvm/jamvm-2.0.0-r1.ebuild
+++ b/dev-java/jamvm/jamvm-2.0.0-r1.ebuild
@@ -22,10 +22,14 @@ DEPEND="dev-java/gnu-classpath:0.98
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 "${FILESDIR}/classes-location.patch"
- epatch "${FILESDIR}/noexecstack.patch"
+ epatch "${PATCHES[@]}"
eautoreconf
# These come precompiled.
@@ -65,7 +69,7 @@ create_launcher() {
-Xbootclasspath/p:/usr/share/classpath/tools.zip" \
gnu.classpath.tools.${1}.Main "\$@"
EOF
- chmod +x "${script}"
+ chmod +x "${script}" || die
}
src_install() {
@@ -77,7 +81,7 @@ src_install() {
dodoc ACKNOWLEDGEMENTS AUTHORS ChangeLog NEWS README
- set_java_env "${FILESDIR}/${PN}.env"
+ set_java_env "${FILESDIR}/${P}-env.file"
dodir ${JDK_DIR}/bin
dosym /usr/bin/jamvm ${JDK_DIR}/bin/java
@@ -97,11 +101,11 @@ src_install() {
local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)"
exeinto ${JDK_DIR}/bin
- cat "${FILESDIR}"/javac.in | sed -e "s#@JAVA@#/usr/bin/jamvm#" \
+ 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#" \
- | newexe - javac
+ "${FILESDIR}"/"${P}-javac.in" | newexe - javac
local libarch="${ARCH}"
[ ${ARCH} == x86 ] && libarch="i386"
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jamvm/files/, dev-java/jamvm/
@ 2015-12-03 23:41 Patrice Clement
0 siblings, 0 replies; 3+ messages in thread
From: Patrice Clement @ 2015-12-03 23:41 UTC (permalink / raw
To: gentoo-commits
commit: a9c8796f3650d5ab6ef10fed311fc7f3d535fdda
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 3 21:23:52 2015 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Thu Dec 3 23:41:23 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9c8796f
dev-java/jamvm: Clean up old.
Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
dev-java/jamvm/Manifest | 1 -
.../jamvm/files/jamvm-1.5.4-classes-location.patch | 27 -------
dev-java/jamvm/files/jamvm-1.5.4-env.file | 11 ---
dev-java/jamvm/jamvm-1.5.4-r2.ebuild | 92 ----------------------
4 files changed, 131 deletions(-)
diff --git a/dev-java/jamvm/Manifest b/dev-java/jamvm/Manifest
index 144c16d..7aa2e6b 100644
--- a/dev-java/jamvm/Manifest
+++ b/dev-java/jamvm/Manifest
@@ -1,2 +1 @@
-DIST jamvm-1.5.4.tar.gz 656283 SHA256 7865693698bc4322cabe1014a4b7ebdec1bc1daf45f1a4457b6e908a4446b124 SHA512 a4a7a2917881262fee19b6aedd9dc50a78463c5e4b02bda4b8184aef49797e3476f8ec8671047a01ba246af7d84cbe58f57ee84bb198817738c79d9f62c1ddbc WHIRLPOOL 615d94ab3a8359c8d6d0a2347d836c0a6adceaeda03a72d105b094f4ffb3161a5f3abbd4c12aa75703823da203d1cee91591e829a796813f82fcfbf2703068f2
DIST jamvm-2.0.0.tar.gz 741459 SHA256 76428e96df0ae9dd964c7a7c74c1e9a837e2f312c39e9a357fa8178f7eff80da SHA512 8ac27787ee94fa8fde962635d3c08d1dc1e5244c9d56bb693e73f3fd9b58e944ad3f7a0127afeed727d7c00d904a775d2c483157f5ac87e7eab6ecade1aad21d WHIRLPOOL 7e80be683fafb444cd417502b96089ce4f6879a049ca49e33691b4d5d6755814654ab4ed7626b666dd48f9d6101567b2a12de43b916055ea1d067c5d4df06443
diff --git a/dev-java/jamvm/files/jamvm-1.5.4-classes-location.patch b/dev-java/jamvm/files/jamvm-1.5.4-classes-location.patch
deleted file mode 100644
index 57d046a..0000000
--- a/dev-java/jamvm/files/jamvm-1.5.4-classes-location.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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 @@
- 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 -ur jamvm-1.5.0.old/src/class.h jamvm-1.5.0/src/class.h
---- jamvm-1.5.0.old/src/class.h 2008-03-03 17:31:46.000000000 +0200
-+++ jamvm-1.5.0/src/class.h 2008-03-03 17:36:51.000000000 +0200
-@@ -39,10 +39,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-1.5.4-env.file b/dev-java/jamvm/files/jamvm-1.5.4-env.file
deleted file mode 100644
index 85c551e..0000000
--- a/dev-java/jamvm/files/jamvm-1.5.4-env.file
+++ /dev/null
@@ -1,11 +0,0 @@
-VERSION="JamVM JRE @PV@"
-JAVA_HOME="/usr/@LIBDIR@/@PN@"
-BOOTCLASSPATH="${JAVA_HOME}/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/jamvm-1.5.4-r2.ebuild b/dev-java/jamvm/jamvm-1.5.4-r2.ebuild
deleted file mode 100644
index 03dccea..0000000
--- a/dev-java/jamvm/jamvm-1.5.4-r2.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-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 ppc x86"
-IUSE="debug libffi"
-
-CLASSPATH_SLOT=0.98
-DEPEND="dev-java/gnu-classpath:${CLASSPATH_SLOT}
- libffi? ( virtual/libffi )
- amd64? ( virtual/libffi )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/"${P}-classes-location.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
-}
-
-CLASSPATH_DIR="/usr/gnu-classpath-${CLASSPATH_SLOT}"
-
-src_configure() {
- # Keep libjvm.so out of /usr
- # https://bugs.gentoo.org/show_bug.cgi?id=181896
- INSTALL_DIR="/usr/$(get_libdir)/${PN}"
-
- filter-flags "-fomit-frame-pointer"
-
- if use amd64 || use libffi; then
- append-cflags "$(pkg-config --cflags-only-I libffi)"
- fi
-
- local fficonf="--enable-ffi"
- use !amd64 && fficonf="$(use_enable libffi ffi)"
-
- econf ${fficonf} \
- --disable-dependency-tracking \
- $(use_enable debug trace) \
- --prefix=${INSTALL_DIR} \
- --datadir=/usr/$(get_libdir) \
- --bindir=/usr/bin \
- --libdir=${INSTALL_DIR}/lib \
- --with-classpath-install-dir=${CLASSPATH_DIR}
-}
-
-create_launcher() {
- local script="${D}/${INSTALL_DIR}/bin/${1}"
- cat > "${script}" <<-EOF
- #!/bin/sh
- exec /usr/bin/jamvm \
- -Xbootclasspath/p:"${CLASSPATH_DIR}/share/classpath/tools.zip" \
- gnu.classpath.tools.${1}.Main "\$@"
- EOF
- chmod +x "${script}"
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- dodoc ACKNOWLEDGEMENTS AUTHORS ChangeLog NEWS README
-
- set_java_env "${FILESDIR}/${P}-env.file"
-
- dosym /usr/bin/jamvm ${INSTALL_DIR}/bin/java
- dosym ${CLASSPATH_DIR}/share/classpath/glibj.zip ${INSTALL_DIR}/jre/lib/rt.jar
- dosym ${CLASSPATH_DIR}/share/classpath/tools.zip ${INSTALL_DIR}/lib/tools.jar
- for file in ${CLASSPATH_DIR}/bin/*; do
- base=$(basename ${file})
- create_launcher ${base#g}
- done
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-12-03 23:41 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-24 17:29 [gentoo-commits] repo/gentoo:master commit in: dev-java/jamvm/files/, dev-java/jamvm/ Patrice Clement
-- strict thread matches above, loose matches on Subject: below --
2015-12-03 23:41 Patrice Clement
2015-10-24 9:03 Patrice Clement
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox