commit: bc971f907057c1a87f97af49759bd851dc2261f8
Author: Jory Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 15 02:30:38 2021 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Wed Dec 15 02:31:12 2021 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=bc971f90
dev-java/jamvm: Drop ebuild, no longer a standalone dep for icedtea
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org>
dev-java/jamvm/Manifest | 1 -
.../jamvm/files/jamvm-2.0.0-classes-location.patch | 27 -----
dev-java/jamvm/files/jamvm-2.0.0-env.file | 16 ---
dev-java/jamvm/files/jamvm-2.0.0-fenv.patch | 62 ----------
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 | 132 ---------------------
dev-java/jamvm/metadata.xml | 11 --
8 files changed, 354 deletions(-)
diff --git a/dev-java/jamvm/Manifest b/dev-java/jamvm/Manifest
deleted file mode 100644
index ad8f9433..00000000
--- a/dev-java/jamvm/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jamvm-2.0.0.tar.gz 741459 BLAKE2B
9b8b0f8cfd8f56c0b835144c07aaca709ef466fdfe5df18438d05c66cd8a07fecfebf27e1581c67658feb3674a96c2e916b85f13dc434baf2db9be4e4fbfd0cf
SHA512
8ac27787ee94fa8fde962635d3c08d1dc1e5244c9d56bb693e73f3fd9b58e944ad3f7a0127afeed727d7c00d904a775d2c483157f5ac87e7eab6ecade1aad21d
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
deleted file mode 100644
index 6cf7611f..00000000
--- a/dev-java/jamvm/files/jamvm-2.0.0-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-2.0.0-env.file
b/dev-java/jamvm/files/jamvm-2.0.0-env.file
deleted file mode 100644
index 5eee6a9e..00000000
--- a/dev-java/jamvm/files/jamvm-2.0.0-env.file
+++ /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/jamvm-2.0.0-fenv.patch
b/dev-java/jamvm/files/jamvm-2.0.0-fenv.patch
deleted file mode 100644
index 6872a6ec..00000000
--- a/dev-java/jamvm/files/jamvm-2.0.0-fenv.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -rupN a/src/os/linux/i386/init.c b/src/os/linux/i386/init.c
---- a/src/os/linux/i386/init.c 2012-05-17 21:01:47.000000000 +0000
-+++ b/src/os/linux/i386/init.c 2016-03-18 16:41:12.578719722 +0000
-@@ -19,18 +19,18 @@
- * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
--#include <fpu_control.h>
-+#include <fenv.h>
-
- /* Change floating point precision to double (64-bit) from
- * the extended (80-bit) Linux default. */
-
- void setDoublePrecision() {
-- fpu_control_t cw;
-+ fenv_t fenv;
-
-- _FPU_GETCW(cw);
-- cw &= ~_FPU_EXTENDED;
-- cw |= _FPU_DOUBLE;
-- _FPU_SETCW(cw);
-+ fegetenv(&fenv);
-+ fenv.__control_word &= ~0x300; /* _FPU_EXTENDED */
-+ fenv.__control_word |= 0x200; /* _FPU_DOUBLE */
-+ fesetenv(&fenv);
- }
-
- void initialisePlatform() {
-diff -rupN a/src/os/linux/x86_64/init.c b/src/os/linux/x86_64/init.c
---- a/src/os/linux/x86_64/init.c 2012-05-17 21:01:47.000000000 +0000
-+++ b/src/os/linux/x86_64/init.c 2016-03-18 16:42:41.498722575 +0000
-@@ -19,9 +19,7 @@
- * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
--#ifdef __linux__
--#include <fpu_control.h>
--#endif
-+#include <fenv.h>
-
- /* Change the x87 FPU precision to double (64-bit) from the extended
- (80-bit) Linux default. Note, unlike on i386, my testcases pass
-@@ -30,14 +28,12 @@
- */
-
- void setDoublePrecision() {
--#ifdef __linux__
-- fpu_control_t cw;
-+ fenv_t fenv;
-
-- _FPU_GETCW(cw);
-- cw &= ~_FPU_EXTENDED;
-- cw |= _FPU_DOUBLE;
-- _FPU_SETCW(cw);
--#endif
-+ fegetenv(&fenv);
-+ fenv.__control_word &= ~0x300; /*_FPU_EXTENDED */
-+ fenv.__control_word |= 0x200; /*_FPU_DOUBLE */
-+ fesetenv(&fenv);
- }
-
- void initialisePlatform() {
diff --git a/dev-java/jamvm/files/jamvm-2.0.0-javac.in
b/dev-java/jamvm/files/jamvm-2.0.0-javac.in
deleted file mode 100644
index 8eeda68c..00000000
--- a/dev-java/jamvm/files/jamvm-2.0.0-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/jamvm-2.0.0-noexecstack.patch
b/dev-java/jamvm/files/jamvm-2.0.0-noexecstack.patch
deleted file mode 100644
index 2a0f14c7..00000000
--- a/dev-java/jamvm/files/jamvm-2.0.0-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 2ccbf651..00000000
--- a/dev-java/jamvm/jamvm-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit epatch flag-o-matic multilib java-vm-2 autotools toolchain-funcs
-
-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"
-
-RDEPEND="dev-java/gnu-classpath:0.98
- || ( dev-java/eclipse-ecj:* dev-java/ecj-gcj:* )
- libffi? ( dev-libs/libffi:= )
- ppc64? ( dev-libs/libffi:= )
- sparc? ( dev-libs/libffi:= )"
-DEPEND="
- ${DEPEND}
- ppc64? ( virtual/pkgconfig )
- sparc? ( virtual/pkgconfig )
- libffi? ( virtual/pkgconfig )
-"
-
-PATCHES=(
- "${FILESDIR}"/"${P}-classes-location.patch"
- "${FILESDIR}"/"${P}-noexecstack.patch"
- "${FILESDIR}"/"${P}-fenv.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 "$($(tc-getPKG_CONFIG) --cflags-only-I libffi)"
- fi
-
- local fficonf="--enable-ffi"
- if { ! use ppc64 && ! use sparc; }; then
- fficonf="$(use_enable libffi ffi)"
- fi
-
- econf ${fficonf} \
- $(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
- else
- dosym $files \
- ${JDK_DIR}/bin/$(echo $files|sed "s#$(dirname
$files)/g##")
- 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
deleted file mode 100644
index 991f28de..00000000
--- a/dev-java/jamvm/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
- <maintainer type="project">
- <email>[email protected]</email>
- <name>Java</name>
- </maintainer>
- <upstream>
- <remote-id type="sourceforge">jamvm</remote-id>
- </upstream>
-</pkgmetadata>
