* [gentoo-commits] proj/java:master commit in: dev-java/jamvm/files/, dev-java/jamvm/
@ 2014-11-28 19:27 Andrew John Hughes
0 siblings, 0 replies; 2+ messages in thread
From: Andrew John Hughes @ 2014-11-28 19:27 UTC (permalink / raw
To: gentoo-commits
commit: e53169cc34bae1eaf0f38e66ccdd4a878e469520
Author: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
AuthorDate: Fri Nov 28 19:27:28 2014 +0000
Commit: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
CommitDate: Fri Nov 28 19:27:28 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/java.git;a=commit;h=e53169cc
Support JamVM 2.0.0.
Package-Manager: portage-2.2.14
Manifest-Sign-Key: 248BDC07
---
dev-java/jamvm/ChangeLog | 224 ++++++++++++++++++++++++++++
dev-java/jamvm/Manifest | 26 ++++
dev-java/jamvm/files/classes-location.patch | 27 ++++
dev-java/jamvm/files/jamvm.env | 11 ++
dev-java/jamvm/jamvm-2.0.0.ebuild | 88 +++++++++++
dev-java/jamvm/metadata.xml | 5 +
6 files changed, 381 insertions(+)
diff --git a/dev-java/jamvm/ChangeLog b/dev-java/jamvm/ChangeLog
new file mode 100644
index 0000000..726914a
--- /dev/null
+++ b/dev-java/jamvm/ChangeLog
@@ -0,0 +1,224 @@
+# ChangeLog for dev-java/jamvm
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jamvm/ChangeLog,v 1.53 2014/08/10 20:16:11 slyfox Exp $
+
+ 10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> jamvm-1.5.4-r2.ebuild:
+ QA: drop trailing '.' from DESCRIPTION
+
+ 17 Jun 2014; Manuel Rüger <mrueg@gentoo.org> -files/jamvm-1.5.4-r1.env,
+ -jamvm-1.5.4-r1.ebuild:
+ NM: Cleanup superseeded ebuilds.
+
+ 07 Dec 2012; Agostino Sarubbo <ago@gentoo.org> jamvm-1.5.4-r2.ebuild:
+ Stable for ppc, wrt bug #425624
+
+ 12 Jul 2012; Agostino Sarubbo <ago@gentoo.org> jamvm-1.5.4-r2.ebuild:
+ Stable for amd64, wrt bug #425624
+
+ 12 Jul 2012; Jeff Horelick <jdhore@gentoo.org> jamvm-1.5.4-r2.ebuild:
+ marked x86 per bug 425624
+
+*jamvm-1.5.4-r2 (14 May 2012)
+
+ 14 May 2012; Ralph Sennhauser <sera@gentoo.org> +jamvm-1.5.4-r2.ebuild,
+ +files/jamvm-1.5.4-r2.env:
+ Only provide JRE. #371461
+
+ 28 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> metadata.xml:
+ USE="libffi" is now global USE flag.
+
+ 08 Jul 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+ +files/classes-location.patch:
+ Restore patch that is still needed.
+
+ 06 Jul 2010; Vlastimil Babka <caster@gentoo.org> -jamvm-1.4.2.ebuild,
+ -jamvm-1.5.0-r3.ebuild, -files/jamvm-1.5.0.env, -jamvm-1.5.4.ebuild,
+ -files/classes-location.patch, -files/jamvm.env:
+ Cleanup.
+
+ 05 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> jamvm-1.4.2.ebuild:
+ Drop ppc64 wrt #168736, Comment #17
+
+ 24 May 2010; Pacho Ramos <pacho@gentoo.org> jamvm-1.5.4-r1.ebuild:
+ stable amd64, bug 317411
+
+ 12 May 2010; Joseph Jezak <josejx@gentoo.org> jamvm-1.5.4-r1.ebuild:
+ Marked ppc stable for bug #317411.
+
+ 10 May 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+ jamvm-1.5.4-r1.ebuild:
+ x86 stable wrt bug #317411
+
+*jamvm-1.5.4-r1 (27 Mar 2010)
+
+ 27 Mar 2010; Vlastimil Babka <caster@gentoo.org> +jamvm-1.5.4-r1.ebuild,
+ +files/jamvm-1.5.4-r1.env:
+ Revbump to switch to gnu-classpath-0.98, move the install to
+ /usr/lib/jamvm, apply stuff (compatibility symlinks) from java-overlay.
+
+*jamvm-1.5.4 (27 Mar 2010)
+
+ 27 Mar 2010; Alistair Bush <ali_bush@gentoo.org> +jamvm-1.5.4.ebuild:
+ Version Bump.
+
+ 19 Jul 2009; nixnut <nixnut@gentoo.org> jamvm-1.5.0-r3.ebuild:
+ ppc stable #272674
+
+ 11 Jun 2009; Markus Meier <maekke@gentoo.org> jamvm-1.5.0-r3.ebuild:
+ amd64 stable, bug #272674
+
+ 10 Jun 2009; Christian Faulhammer <fauli@gentoo.org>
+ jamvm-1.5.0-r3.ebuild:
+ stable x86, bug 272674
+
+*jamvm-1.5.0-r3 (04 Jun 2009)
+
+ 04 Jun 2009; Samuli Suominen <ssuominen@gentoo.org>
+ +jamvm-1.5.0-r3.ebuild:
+ Convert to virtual/libffi wrt #272051
+
+ 07 Mar 2009; Petteri Räty <betelgeuse@gentoo.org> jamvm-1.5.0-r2.ebuild:
+ Migrate to EAPI 2.
+
+ 17 May 2008; nixnut <nixnut@gentoo.org> jamvm-1.5.0-r2.ebuild:
+ Stable on ppc wrt bug 216689
+
+ 13 Apr 2008; Petteri Räty <betelgeuse@gentoo.org> -jamvm-1.4.5.ebuild,
+ -jamvm-1.5.0.ebuild, -jamvm-1.5.0-r1.ebuild:
+ Remove old versions/revisions.
+
+ 09 Apr 2008; Markus Meier <maekke@gentoo.org> jamvm-1.5.0-r2.ebuild:
+ amd64/x86 stable, bug #216689
+
+ 20 Mar 2008; Petteri Räty <betelgeuse@gentoo.org> jamvm-1.5.0-r2.ebuild:
+ Always needs libffi support on amd64. Fixes bug #213882.
+
+*jamvm-1.5.0-r2 (04 Mar 2008)
+
+ 04 Mar 2008; Petteri Räty <betelgeuse@gentoo.org> +jamvm-1.5.0-r2.ebuild:
+ Revision bump to wrap all the tools provided by gnu-classpath.
+
+*jamvm-1.5.0-r1 (03 Mar 2008)
+
+ 03 Mar 2008; Petteri Räty <betelgeuse@gentoo.org> files/jamvm-1.5.0.env,
+ +jamvm-1.5.0-r1.ebuild:
+ Add vm file changes required to integrate with our eclasses. PDEPEND on
+ dev-java/ant-eclipse-ecj so that eant works.
+
+ 03 Mar 2008; Petteri Räty <betelgeuse@gentoo.org> -jamvm-1.4.4-r1.ebuild:
+ Delete old version.
+
+*jamvm-1.5.0 (03 Mar 2008)
+
+ 03 Mar 2008; Petteri Räty <betelgeuse@gentoo.org> +files/jamvm-1.5.0.env,
+ +files/classes-location.patch, +jamvm-1.5.0.ebuild:
+ Version bump. Fixes bug #181896 and part of fixing bug #163724.
+
+*jamvm-1.4.5 (28 Feb 2007)
+
+ 28 Feb 2007; Petteri Räty <betelgeuse@gentoo.org> +jamvm-1.4.5.ebuild:
+ Version bump. This version makes using dev-util/libffi optional via the ffi
+ use flag. Fixes bug #158754.
+
+ 01 Dec 2006; Petteri Räty <betelgeuse@gentoo.org> files/jamvm.env:
+ Changed PROVIDES_TYPE from "JDK" to "JDK JRE"
+
+ 19 Nov 2006; Petteri Räty <betelgeuse@gentoo.org> jamvm-1.4.4.ebuild:
+ Fixed gnu-classpath dependency atom to only match the 0.92 slot.
+
+ 19 Nov 2006; Joshua Nichols <nichoj@gentoo.org> jamvm-1.4.4.ebuild:
+ Added PDEPEND to make sure javac (ecj) and javadoc (gjdoc) work properly.
+
+*jamvm-1.4.4 (19 Nov 2006)
+
+ 19 Nov 2006; Joshua Nichols <nichoj@gentoo.org> +files/jamvm.env,
+ +jamvm-1.4.4.ebuild:
+ Version bump, bug #134909. It is now recognized by java-config for using as
+ a VM. Removed ppc64 keyword until dev-libs/libffi can be keyworded.
+
+ 11 Jun 2006; Markus Rothe <corsair@gentoo.org> jamvm-1.4.2.ebuild:
+ Stable on ppc64; bug #105973
+
+ 12 May 2006; Petteri Räty <betelgeuse@gentoo.org> -jamvm-1.3.0.ebuild,
+ -jamvm-1.4.1.ebuild:
+ Removed old versions.
+
+ 12 May 2006; Petteri Räty <betelgeuse@gentoo.org> jamvm-1.4.2.ebuild:
+ Marked stable on x86.
+
+ 01 May 2006; Markus Rothe <corsair@gentoo.org> jamvm-1.4.2.ebuild:
+ Added ~ppc64
+
+ 02 Apr 2006; Petteri Räty <betelgeuse@gentoo.org> metadata.xml:
+ Added java as the herd.
+
+*jamvm-1.4.2 (02 Apr 2006)
+
+ 02 Apr 2006; Petteri Räty <betelgeuse@gentoo.org> +jamvm-1.4.2.ebuild:
+ Version bump. Fixes bug #124959.
+
+ 02 Apr 2006; Petteri Räty <betelgeuse@gentoo.org> -jamvm-1.3.1.ebuild,
+ -jamvm-1.3.3.ebuild:
+ Removed old versions.
+
+ 04 Feb 2006; Stephanie Lockwood-Childs <wormo@gentoo.org>
+ jamvm-1.3.3.ebuild:
+ mark -ppc since it can't build (see bug #111523)
+
+ 04 Feb 2006; Stephanie Lockwood-Childs <wormo@gentoo.org>
+ jamvm-1.4.1.ebuild:
+ mark ~ppc (Bug #116297)
+
+*jamvm-1.4.1 (21 Dec 2005)
+
+ 21 Dec 2005; Petteri Räty <betelgeuse@gentoo.org> +jamvm-1.4.1.ebuild:
+ Version bump. Fixes bug #105893.
+
+*jamvm-1.3.3 (02 Nov 2005)
+
+ 02 Nov 2005; Thomas Matthijs <axxo@gentoo.org> +jamvm-1.3.3.ebuild:
+ version bump
+
+*jamvm-1.3.1 (17 Jun 2005)
+
+ 17 Jun 2005; Jan Brinkmann <luckyduck@gentoo.org>
+ -files/1.2.2-classpath-fix.diff, -jamvm-1.2.3.ebuild, -jamvm-1.2.4.ebuild,
+ -jamvm-1.2.5.ebuild, jamvm-1.3.0.ebuild, +jamvm-1.3.1.ebuild:
+ New upstream version, some generall cleanup. Fixes #96333. Marked 1.3.0
+ stable on x86.
+
+ 04 Jun 2005; Joseph Jezak <josejx@gentoo.org> jamvm-1.3.0.ebuild:
+ Marked ~ppc for bug #95007.
+
+ 09 Apr 2005; Karl Trygve Kalleberg <karltk@gentoo.org> jamvm-1.2.4.ebuild,
+ jamvm-1.2.5.ebuild, jamvm-1.3.0.ebuild:
+ Added filter on -fomit-frame-pointer, which, apart from being a totally
+ useless 'speed optimization', also makes jamvm crash. Fixes #85313.
+
+*jamvm-1.3.0 (01 Apr 2005)
+
+ 01 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> +jamvm-1.3.0.ebuild:
+ new upstream version, fixes #87529
+
+*jamvm-1.2.5 (02 Mar 2005)
+
+ 02 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> +jamvm-1.2.5.ebuild:
+ new upstream release, fixes #83855
+
+*jamvm-1.2.4 (24 Jan 2005)
+
+ 24 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> -jamvm-1.2.2.ebuild,
+ jamvm-1.2.3.ebuild, +jamvm-1.2.4.ebuild:
+ marked 1.2.3 stable on x86, removed old version. added new version, 1.2.4
+ which fixes #79310.
+
+*jamvm-1.2.3 (07 Jan 2005)
+
+ 07 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> +jamvm-1.2.3.ebuild:
+ new version released. fixes bug #77035.
+
+*jamvm-1.2.2 (23 Dec 2004)
+
+ 23 Dec 2004; Karl Trygve Kalleberg <karltk@gentoo.org> jamvm-1.2.2.ebuild:
+ Initial import. Ebuild submitted by Robert Schuster <theBohemian@gmx.net>.
+ Fixes #56571.
diff --git a/dev-java/jamvm/Manifest b/dev-java/jamvm/Manifest
new file mode 100644
index 0000000..798b298
--- /dev/null
+++ b/dev-java/jamvm/Manifest
@@ -0,0 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX classes-location.patch 1276 SHA256 98ecad3eeb0623b3dc01155c9cbd9aacf31e5d5854b183a7be11b64bfdd838a6 SHA512 c399cb8ebce0556a778a1511fec43eeedc2e8d4b1ca732ebd201faf49d6a607baef914fb54e34f2c5b494ace6f5c072d296fb30c65038461e97a518c9e1924bd WHIRLPOOL 91d9c75a260f6f5943d1221bfba77032fc1ce1f8d85217ec4a80aa50b826f36816aa4fe0e1a2ae7cb27c171ec029d8ee3ad512a506c1d31e02276a02b1858e42
+AUX jamvm.env 320 SHA256 0bdb8b07a21509ff5650629546a0bfd1a0fe40e5c7b8e9a8d2a1c3797bfa9f04 SHA512 5924972c0f91eef7b7c04e33dba8458b495aed131c4a587dc19626d060f8d0c92ee2bba221fbc14ed9f965d954cc4d87ecaf6881b5a1052e34c9216b6516ef1f WHIRLPOOL 688aa1051d65839eeb3cd7fcc0b31b39803b71957dbcd7f9bf04a54c5777ccc7ce180888081ff2526ce749af5fc2a9dc61996f1b634bda50090015416d056d13
+DIST jamvm-2.0.0.tar.gz 741459 SHA256 76428e96df0ae9dd964c7a7c74c1e9a837e2f312c39e9a357fa8178f7eff80da SHA512 8ac27787ee94fa8fde962635d3c08d1dc1e5244c9d56bb693e73f3fd9b58e944ad3f7a0127afeed727d7c00d904a775d2c483157f5ac87e7eab6ecade1aad21d WHIRLPOOL 7e80be683fafb444cd417502b96089ce4f6879a049ca49e33691b4d5d6755814654ab4ed7626b666dd48f9d6101567b2a12de43b916055ea1d067c5d4df06443
+EBUILD jamvm-2.0.0.ebuild 2414 SHA256 a9e5b24e0fa1f6156057ac2f576535cc6a02de94b06e8e944bcddcd45182ef98 SHA512 f9bb605b61c01dfd1f1309899544761cb716a59b4de08ac49d254f788bb54099ed4e4a26b60ad28c339bd8a4f0f948f702dc0fccb6f361b50d97214f57e62e9d WHIRLPOOL 9ee1d455dfd0e8bc7bec726e339ee0471c11ceeff38f0d9cd16560972419fd00a6aa455c0b6ca2540f5d8ca26e3414490391c7ec4604db2e35988a4ea8a28db6
+MISC ChangeLog 7671 SHA256 cf7970a21433802bfc41c5c35cdc9134e55331e3cad40b0115bbd66341981e54 SHA512 abce934cce721b758e8bd2323be4936e73555b439e38128d68d8795096b8b5ed210ea9c409bad7ef3b44c14f901543e362d2e71a1eeac4737b29db74f47979c4 WHIRLPOOL 201e30191bbf5e69ca26c9c0c8defd44d5b32f07d0e886d510ae13b34b36d3cd9c1ba9e5ec0069171c8f91c437a8fd68b428148d7c67729afd5294c73e50e38b
+MISC metadata.xml 159 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb SHA512 74dc9ada199a90543b8e1c168c7054f2e973fbfa2551e2b959d67501f2538e269cfb4b2f0905a88a1afa04c20b33961336310ba876f80d47c8e7615b2d7c830a WHIRLPOOL a0ac49efeca233ec4d8f63eb69c8e46e1d4ecbd926693c25b1b8c7415e4c565680936aec46f0c4197116fd7a19a3bb571beee493c18bdae1e5e978e3db84f17a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAEBCAAGBQJUeMygAAoJEDuWpXgki9wHFuQP/2X4m1uJPAuanOmtMFXFXwAq
+uvoUaQcj2D8PbyQWzkmHO3SZjEq86xPwJD2mmAy62aTbkEyWzOQJnliGVYRNs4gr
+PeVnnlZepvuSdqRU9dzJ+fjvZY0bH8XIt21iQk6jno2z+3yGgdMJpV59/XSBorO9
+mNNAP2FbMYR6zVO13ev3pVUawg/oELAa2olOYbCtIW1O/rTL5FF/Lz/SSyOdcqV3
+zwsKMHMnto8CDvxc5uMuC/LcmpNaZf+LPAlsI22IMrvO3iGs8okyheKVx2ab1aGC
+FMxTmk9bJCMEMFU8TXul4PtZ/sni65m+o5PZb88Vfm0ZmUwweRVVwwmryH2INYIn
+Gl7vugYUtlnN9UBcqDH4jO5qb6lOTPz7yBWw+Z8lGAJdb6z04qtdc1O1IQIhdmad
+PQnUDlE2t6126bz+Nnv3l32gTwjNV63SymyNkYhFDtT4RN1aUgW0fRpzGC39TUGu
+8QoiBheKBbG7FWkqiAY3/DAZMbOf7HTxuFHh23r5VNPkuHKY4F6OSMwt0PLSWI06
+9PWoel7TuZPNzlIdqFRDmpO/SHcRQlBEUFRwvRunMmnw+xdR3arPULnimtjEhrhr
+LC04a4yMtC70eghxkElgfyuXHEf/2qabr6WnYxI9xl5J2WzeGpJsSL3bO5QR1XpL
+2EdDXERmsPNmuIu4NIXP
+=ZpoU
+-----END PGP SIGNATURE-----
diff --git a/dev-java/jamvm/files/classes-location.patch b/dev-java/jamvm/files/classes-location.patch
new file mode 100644
index 0000000..6cf7611
--- /dev/null
+++ b/dev-java/jamvm/files/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.env b/dev-java/jamvm/files/jamvm.env
new file mode 100644
index 0000000..85c551e
--- /dev/null
+++ b/dev-java/jamvm/files/jamvm.env
@@ -0,0 +1,11 @@
+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-2.0.0.ebuild b/dev-java/jamvm/jamvm-2.0.0.ebuild
new file mode 100644
index 0000000..a391b2b
--- /dev/null
+++ b/dev-java/jamvm/jamvm-2.0.0.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jamvm/jamvm-1.5.4-r2.ebuild,v 1.5 2014/08/10 20:16:11 slyfox Exp $
+
+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"
+IUSE="debug libffi"
+
+CLASSPATH_SLOT=0.99
+DEPEND="dev-java/gnu-classpath:${CLASSPATH_SLOT}
+ libffi? ( virtual/libffi )
+ amd64? ( virtual/libffi )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ # without this patch, classes.zip is not found at runtime
+ epatch "${FILESDIR}/classes-location.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
+}
+
+CLASSPATH_DIR="/usr/gnu-classpath-${CLASSPATH_SLOT}"
+
+src_configure() {
+ # Keep libjvm.so out of /usr
+ # http://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}/${PN}.env"
+
+ 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
+}
diff --git a/dev-java/jamvm/metadata.xml b/dev-java/jamvm/metadata.xml
new file mode 100644
index 0000000..250f2d1
--- /dev/null
+++ b/dev-java/jamvm/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>java</herd>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/java:master commit in: dev-java/jamvm/files/, dev-java/jamvm/
@ 2024-04-15 8:18 Florian Schmaus
0 siblings, 0 replies; 2+ messages in thread
From: Florian Schmaus @ 2024-04-15 8:18 UTC (permalink / raw
To: gentoo-commits
commit: fd74432246a2cb0655239b1f58bfb5c1320aee90
Author: Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 15 08:17:59 2024 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Mon Apr 15 08:17:59 2024 +0000
URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=fd744322
dev-java/jamvm: treeclean
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
dev-java/jamvm/ChangeLog | 238 ----------------------------
dev-java/jamvm/Manifest | 1 -
dev-java/jamvm/files/classes-location.patch | 27 ----
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 | 127 ---------------
dev-java/jamvm/metadata.xml | 8 -
8 files changed, 522 deletions(-)
diff --git a/dev-java/jamvm/ChangeLog b/dev-java/jamvm/ChangeLog
deleted file mode 100644
index 089058fd..00000000
--- a/dev-java/jamvm/ChangeLog
+++ /dev/null
@@ -1,238 +0,0 @@
-# ChangeLog for dev-java/jamvm
-# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jamvm/ChangeLog,v 1.53 2014/08/10 20:16:11 slyfox Exp $
-
- 08 Jul 2015; Andrew John Hughes <gnu_andrew@member.fsf.org>
- jamvm-2.0.0-r1.ebuild:
- According to the JamVM homepage, it's now ppc64 & sparc that need libffi.
-
- 08 Jul 2015; Andrew John Hughes <gnu_andrew@member.fsf.org>
- +files/noexecstack.patch, jamvm-2.0.0-r1.ebuild:
- Fix executable stack on JamVM.
-
-*jamvm-2.0.0-r1 (08 Jul 2015)
-
- 08 Jul 2015; Andrew John Hughes <gnu_andrew@member.fsf.org> +files/javac.in,
- +jamvm-2.0.0-r1.ebuild, -jamvm-2.0.0.ebuild, files/jamvm.env:
- Sync JamVM build with changes to GNU Classpath and CACAO ebuilds.
-
- 10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> jamvm-1.5.4-r2.ebuild:
- QA: drop trailing '.' from DESCRIPTION
-
- 17 Jun 2014; Manuel Rüger <mrueg@gentoo.org> -files/jamvm-1.5.4-r1.env,
- -jamvm-1.5.4-r1.ebuild:
- NM: Cleanup superseeded ebuilds.
-
- 07 Dec 2012; Agostino Sarubbo <ago@gentoo.org> jamvm-1.5.4-r2.ebuild:
- Stable for ppc, wrt bug #425624
-
- 12 Jul 2012; Agostino Sarubbo <ago@gentoo.org> jamvm-1.5.4-r2.ebuild:
- Stable for amd64, wrt bug #425624
-
- 12 Jul 2012; Jeff Horelick <jdhore@gentoo.org> jamvm-1.5.4-r2.ebuild:
- marked x86 per bug 425624
-
-*jamvm-1.5.4-r2 (14 May 2012)
-
- 14 May 2012; Ralph Sennhauser <sera@gentoo.org> +jamvm-1.5.4-r2.ebuild,
- +files/jamvm-1.5.4-r2.env:
- Only provide JRE. #371461
-
- 28 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> metadata.xml:
- USE="libffi" is now global USE flag.
-
- 08 Jul 2010; Diego E. Pettenò <flameeyes@gentoo.org>
- +files/classes-location.patch:
- Restore patch that is still needed.
-
- 06 Jul 2010; Vlastimil Babka <caster@gentoo.org> -jamvm-1.4.2.ebuild,
- -jamvm-1.5.0-r3.ebuild, -files/jamvm-1.5.0.env, -jamvm-1.5.4.ebuild,
- -files/classes-location.patch, -files/jamvm.env:
- Cleanup.
-
- 05 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> jamvm-1.4.2.ebuild:
- Drop ppc64 wrt #168736, Comment #17
-
- 24 May 2010; Pacho Ramos <pacho@gentoo.org> jamvm-1.5.4-r1.ebuild:
- stable amd64, bug 317411
-
- 12 May 2010; Joseph Jezak <josejx@gentoo.org> jamvm-1.5.4-r1.ebuild:
- Marked ppc stable for bug #317411.
-
- 10 May 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
- jamvm-1.5.4-r1.ebuild:
- x86 stable wrt bug #317411
-
-*jamvm-1.5.4-r1 (27 Mar 2010)
-
- 27 Mar 2010; Vlastimil Babka <caster@gentoo.org> +jamvm-1.5.4-r1.ebuild,
- +files/jamvm-1.5.4-r1.env:
- Revbump to switch to gnu-classpath-0.98, move the install to
- /usr/lib/jamvm, apply stuff (compatibility symlinks) from java-overlay.
-
-*jamvm-1.5.4 (27 Mar 2010)
-
- 27 Mar 2010; Alistair Bush <ali_bush@gentoo.org> +jamvm-1.5.4.ebuild:
- Version Bump.
-
- 19 Jul 2009; nixnut <nixnut@gentoo.org> jamvm-1.5.0-r3.ebuild:
- ppc stable #272674
-
- 11 Jun 2009; Markus Meier <maekke@gentoo.org> jamvm-1.5.0-r3.ebuild:
- amd64 stable, bug #272674
-
- 10 Jun 2009; Christian Faulhammer <fauli@gentoo.org>
- jamvm-1.5.0-r3.ebuild:
- stable x86, bug 272674
-
-*jamvm-1.5.0-r3 (04 Jun 2009)
-
- 04 Jun 2009; Samuli Suominen <ssuominen@gentoo.org>
- +jamvm-1.5.0-r3.ebuild:
- Convert to virtual/libffi wrt #272051
-
- 07 Mar 2009; Petteri Räty <betelgeuse@gentoo.org> jamvm-1.5.0-r2.ebuild:
- Migrate to EAPI 2.
-
- 17 May 2008; nixnut <nixnut@gentoo.org> jamvm-1.5.0-r2.ebuild:
- Stable on ppc wrt bug 216689
-
- 13 Apr 2008; Petteri Räty <betelgeuse@gentoo.org> -jamvm-1.4.5.ebuild,
- -jamvm-1.5.0.ebuild, -jamvm-1.5.0-r1.ebuild:
- Remove old versions/revisions.
-
- 09 Apr 2008; Markus Meier <maekke@gentoo.org> jamvm-1.5.0-r2.ebuild:
- amd64/x86 stable, bug #216689
-
- 20 Mar 2008; Petteri Räty <betelgeuse@gentoo.org> jamvm-1.5.0-r2.ebuild:
- Always needs libffi support on amd64. Fixes bug #213882.
-
-*jamvm-1.5.0-r2 (04 Mar 2008)
-
- 04 Mar 2008; Petteri Räty <betelgeuse@gentoo.org> +jamvm-1.5.0-r2.ebuild:
- Revision bump to wrap all the tools provided by gnu-classpath.
-
-*jamvm-1.5.0-r1 (03 Mar 2008)
-
- 03 Mar 2008; Petteri Räty <betelgeuse@gentoo.org> files/jamvm-1.5.0.env,
- +jamvm-1.5.0-r1.ebuild:
- Add vm file changes required to integrate with our eclasses. PDEPEND on
- dev-java/ant-eclipse-ecj so that eant works.
-
- 03 Mar 2008; Petteri Räty <betelgeuse@gentoo.org> -jamvm-1.4.4-r1.ebuild:
- Delete old version.
-
-*jamvm-1.5.0 (03 Mar 2008)
-
- 03 Mar 2008; Petteri Räty <betelgeuse@gentoo.org> +files/jamvm-1.5.0.env,
- +files/classes-location.patch, +jamvm-1.5.0.ebuild:
- Version bump. Fixes bug #181896 and part of fixing bug #163724.
-
-*jamvm-1.4.5 (28 Feb 2007)
-
- 28 Feb 2007; Petteri Räty <betelgeuse@gentoo.org> +jamvm-1.4.5.ebuild:
- Version bump. This version makes using dev-util/libffi optional via the ffi
- use flag. Fixes bug #158754.
-
- 01 Dec 2006; Petteri Räty <betelgeuse@gentoo.org> files/jamvm.env:
- Changed PROVIDES_TYPE from "JDK" to "JDK JRE"
-
- 19 Nov 2006; Petteri Räty <betelgeuse@gentoo.org> jamvm-1.4.4.ebuild:
- Fixed gnu-classpath dependency atom to only match the 0.92 slot.
-
- 19 Nov 2006; Joshua Nichols <nichoj@gentoo.org> jamvm-1.4.4.ebuild:
- Added PDEPEND to make sure javac (ecj) and javadoc (gjdoc) work properly.
-
-*jamvm-1.4.4 (19 Nov 2006)
-
- 19 Nov 2006; Joshua Nichols <nichoj@gentoo.org> +files/jamvm.env,
- +jamvm-1.4.4.ebuild:
- Version bump, bug #134909. It is now recognized by java-config for using as
- a VM. Removed ppc64 keyword until dev-libs/libffi can be keyworded.
-
- 11 Jun 2006; Markus Rothe <corsair@gentoo.org> jamvm-1.4.2.ebuild:
- Stable on ppc64; bug #105973
-
- 12 May 2006; Petteri Räty <betelgeuse@gentoo.org> -jamvm-1.3.0.ebuild,
- -jamvm-1.4.1.ebuild:
- Removed old versions.
-
- 12 May 2006; Petteri Räty <betelgeuse@gentoo.org> jamvm-1.4.2.ebuild:
- Marked stable on x86.
-
- 01 May 2006; Markus Rothe <corsair@gentoo.org> jamvm-1.4.2.ebuild:
- Added ~ppc64
-
- 02 Apr 2006; Petteri Räty <betelgeuse@gentoo.org> metadata.xml:
- Added java as the herd.
-
-*jamvm-1.4.2 (02 Apr 2006)
-
- 02 Apr 2006; Petteri Räty <betelgeuse@gentoo.org> +jamvm-1.4.2.ebuild:
- Version bump. Fixes bug #124959.
-
- 02 Apr 2006; Petteri Räty <betelgeuse@gentoo.org> -jamvm-1.3.1.ebuild,
- -jamvm-1.3.3.ebuild:
- Removed old versions.
-
- 04 Feb 2006; Stephanie Lockwood-Childs <wormo@gentoo.org>
- jamvm-1.3.3.ebuild:
- mark -ppc since it can't build (see bug #111523)
-
- 04 Feb 2006; Stephanie Lockwood-Childs <wormo@gentoo.org>
- jamvm-1.4.1.ebuild:
- mark ~ppc (Bug #116297)
-
-*jamvm-1.4.1 (21 Dec 2005)
-
- 21 Dec 2005; Petteri Räty <betelgeuse@gentoo.org> +jamvm-1.4.1.ebuild:
- Version bump. Fixes bug #105893.
-
-*jamvm-1.3.3 (02 Nov 2005)
-
- 02 Nov 2005; Thomas Matthijs <axxo@gentoo.org> +jamvm-1.3.3.ebuild:
- version bump
-
-*jamvm-1.3.1 (17 Jun 2005)
-
- 17 Jun 2005; Jan Brinkmann <luckyduck@gentoo.org>
- -files/1.2.2-classpath-fix.diff, -jamvm-1.2.3.ebuild, -jamvm-1.2.4.ebuild,
- -jamvm-1.2.5.ebuild, jamvm-1.3.0.ebuild, +jamvm-1.3.1.ebuild:
- New upstream version, some generall cleanup. Fixes #96333. Marked 1.3.0
- stable on x86.
-
- 04 Jun 2005; Joseph Jezak <josejx@gentoo.org> jamvm-1.3.0.ebuild:
- Marked ~ppc for bug #95007.
-
- 09 Apr 2005; Karl Trygve Kalleberg <karltk@gentoo.org> jamvm-1.2.4.ebuild,
- jamvm-1.2.5.ebuild, jamvm-1.3.0.ebuild:
- Added filter on -fomit-frame-pointer, which, apart from being a totally
- useless 'speed optimization', also makes jamvm crash. Fixes #85313.
-
-*jamvm-1.3.0 (01 Apr 2005)
-
- 01 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> +jamvm-1.3.0.ebuild:
- new upstream version, fixes #87529
-
-*jamvm-1.2.5 (02 Mar 2005)
-
- 02 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> +jamvm-1.2.5.ebuild:
- new upstream release, fixes #83855
-
-*jamvm-1.2.4 (24 Jan 2005)
-
- 24 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> -jamvm-1.2.2.ebuild,
- jamvm-1.2.3.ebuild, +jamvm-1.2.4.ebuild:
- marked 1.2.3 stable on x86, removed old version. added new version, 1.2.4
- which fixes #79310.
-
-*jamvm-1.2.3 (07 Jan 2005)
-
- 07 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> +jamvm-1.2.3.ebuild:
- new version released. fixes bug #77035.
-
-*jamvm-1.2.2 (23 Dec 2004)
-
- 23 Dec 2004; Karl Trygve Kalleberg <karltk@gentoo.org> jamvm-1.2.2.ebuild:
- Initial import. Ebuild submitted by Robert Schuster <theBohemian@gmx.net>.
- Fixes #56571.
diff --git a/dev-java/jamvm/Manifest b/dev-java/jamvm/Manifest
deleted file mode 100644
index 7aa2e6bb..00000000
--- a/dev-java/jamvm/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 6cf7611f..00000000
--- a/dev-java/jamvm/files/classes-location.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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.env b/dev-java/jamvm/files/jamvm.env
deleted file mode 100644
index 5eee6a9e..00000000
--- a/dev-java/jamvm/files/jamvm.env
+++ /dev/null
@@ -1,16 +0,0 @@
-# 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
deleted file mode 100644
index 8eeda68c..00000000
--- a/dev-java/jamvm/files/javac.in
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/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
deleted file mode 100644
index 2a0f14c7..00000000
--- a/dev-java/jamvm/files/noexecstack.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-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
deleted file mode 100644
index 2e431766..00000000
--- a/dev-java/jamvm/jamvm-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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="debug libffi"
-
-DEPEND="dev-java/gnu-classpath:0
- || ( dev-java/eclipse-ecj:* dev-java/ecj-gcj:* )
- libffi? ( virtual/libffi )
- ppc64? ( virtual/libffi )
- sparc? ( virtual/libffi )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- # without this patch, classes.zip is not found at runtime
- "${FILESDIR}/classes-location.patch"
- "${FILESDIR}/noexecstack.patch"
-)
-
-src_prepare() {
- eapply_user
- 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
- 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
-}
diff --git a/dev-java/jamvm/metadata.xml b/dev-java/jamvm/metadata.xml
deleted file mode 100644
index 37998bf4..00000000
--- a/dev-java/jamvm/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>java@gentoo.org</email>
- <name>Java</name>
- </maintainer>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-04-15 8:18 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-11-28 19:27 [gentoo-commits] proj/java:master commit in: dev-java/jamvm/files/, dev-java/jamvm/ Andrew John Hughes
-- strict thread matches above, loose matches on Subject: below --
2024-04-15 8:18 Florian Schmaus
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox