| 1 |
commit: 1ef677ea660a587c7ffbe07c62d9422abd2443f1 |
| 2 |
Author: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jun 30 14:18:36 2021 +0000 |
| 4 |
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jun 30 14:18:36 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=1ef677ea |
| 7 |
|
| 8 |
dev-java/jamvm: sync with ::gentoo |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.20, Repoman-3.0.2 |
| 11 |
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-java/jamvm/Manifest | 2 +- |
| 14 |
dev-java/jamvm/jamvm-2.0.0-r1.ebuild | 26 +++++++++++++++----------- |
| 15 |
2 files changed, 16 insertions(+), 12 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-java/jamvm/Manifest b/dev-java/jamvm/Manifest |
| 18 |
index 7aa2e6b..ad8f943 100644 |
| 19 |
--- a/dev-java/jamvm/Manifest |
| 20 |
+++ b/dev-java/jamvm/Manifest |
| 21 |
@@ -1 +1 @@ |
| 22 |
-DIST jamvm-2.0.0.tar.gz 741459 SHA256 76428e96df0ae9dd964c7a7c74c1e9a837e2f312c39e9a357fa8178f7eff80da SHA512 8ac27787ee94fa8fde962635d3c08d1dc1e5244c9d56bb693e73f3fd9b58e944ad3f7a0127afeed727d7c00d904a775d2c483157f5ac87e7eab6ecade1aad21d WHIRLPOOL 7e80be683fafb444cd417502b96089ce4f6879a049ca49e33691b4d5d6755814654ab4ed7626b666dd48f9d6101567b2a12de43b916055ea1d067c5d4df06443 |
| 23 |
+DIST jamvm-2.0.0.tar.gz 741459 BLAKE2B 9b8b0f8cfd8f56c0b835144c07aaca709ef466fdfe5df18438d05c66cd8a07fecfebf27e1581c67658feb3674a96c2e916b85f13dc434baf2db9be4e4fbfd0cf SHA512 8ac27787ee94fa8fde962635d3c08d1dc1e5244c9d56bb693e73f3fd9b58e944ad3f7a0127afeed727d7c00d904a775d2c483157f5ac87e7eab6ecade1aad21d |
| 24 |
|
| 25 |
diff --git a/dev-java/jamvm/jamvm-2.0.0-r1.ebuild b/dev-java/jamvm/jamvm-2.0.0-r1.ebuild |
| 26 |
index f16fd6a..2ccbf65 100644 |
| 27 |
--- a/dev-java/jamvm/jamvm-2.0.0-r1.ebuild |
| 28 |
+++ b/dev-java/jamvm/jamvm-2.0.0-r1.ebuild |
| 29 |
@@ -1,9 +1,9 @@ |
| 30 |
-# Copyright 1999-2016 Gentoo Foundation |
| 31 |
+# Copyright 1999-2021 Gentoo Authors |
| 32 |
# Distributed under the terms of the GNU General Public License v2 |
| 33 |
|
| 34 |
EAPI=5 |
| 35 |
|
| 36 |
-inherit eutils flag-o-matic multilib java-vm-2 autotools |
| 37 |
+inherit epatch flag-o-matic multilib java-vm-2 autotools toolchain-funcs |
| 38 |
|
| 39 |
DESCRIPTION="An extremely small and specification-compliant virtual machine" |
| 40 |
HOMEPAGE="http://jamvm.sourceforge.net/" |
| 41 |
@@ -14,12 +14,17 @@ SLOT="0" |
| 42 |
KEYWORDS="amd64 x86" |
| 43 |
IUSE="debug libffi" |
| 44 |
|
| 45 |
-DEPEND="dev-java/gnu-classpath:0.98 |
| 46 |
+RDEPEND="dev-java/gnu-classpath:0.98 |
| 47 |
|| ( dev-java/eclipse-ecj:* dev-java/ecj-gcj:* ) |
| 48 |
- libffi? ( virtual/libffi ) |
| 49 |
- ppc64? ( virtual/libffi ) |
| 50 |
- sparc? ( virtual/libffi )" |
| 51 |
-RDEPEND="${DEPEND}" |
| 52 |
+ libffi? ( dev-libs/libffi:= ) |
| 53 |
+ ppc64? ( dev-libs/libffi:= ) |
| 54 |
+ sparc? ( dev-libs/libffi:= )" |
| 55 |
+DEPEND=" |
| 56 |
+ ${DEPEND} |
| 57 |
+ ppc64? ( virtual/pkgconfig ) |
| 58 |
+ sparc? ( virtual/pkgconfig ) |
| 59 |
+ libffi? ( virtual/pkgconfig ) |
| 60 |
+" |
| 61 |
|
| 62 |
PATCHES=( |
| 63 |
"${FILESDIR}"/"${P}-classes-location.patch" |
| 64 |
@@ -45,7 +50,7 @@ src_configure() { |
| 65 |
filter-flags "-fomit-frame-pointer" |
| 66 |
|
| 67 |
if use ppc64 || use sparc || use libffi; then |
| 68 |
- append-cflags "$(pkg-config --cflags-only-I libffi)" |
| 69 |
+ append-cflags "$($(tc-getPKG_CONFIG) --cflags-only-I libffi)" |
| 70 |
fi |
| 71 |
|
| 72 |
local fficonf="--enable-ffi" |
| 73 |
@@ -54,7 +59,6 @@ src_configure() { |
| 74 |
fi |
| 75 |
|
| 76 |
econf ${fficonf} \ |
| 77 |
- --disable-dependency-tracking \ |
| 78 |
$(use_enable debug trace) \ |
| 79 |
--libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \ |
| 80 |
--includedir="${EPREFIX}"/usr/include/${PN} \ |
| 81 |
@@ -87,10 +91,10 @@ src_install() { |
| 82 |
dosym /usr/bin/jamvm ${JDK_DIR}/bin/java |
| 83 |
for files in ${CLASSPATH_DIR}/g*; do |
| 84 |
if [ $files = "${CLASSPATH_DIR}/bin/gjdoc" ] ; then |
| 85 |
- dosym $files ${JDK_DIR}/bin/javadoc || die |
| 86 |
+ dosym $files ${JDK_DIR}/bin/javadoc |
| 87 |
else |
| 88 |
dosym $files \ |
| 89 |
- ${JDK_DIR}/bin/$(echo $files|sed "s#$(dirname $files)/g##") || die |
| 90 |
+ ${JDK_DIR}/bin/$(echo $files|sed "s#$(dirname $files)/g##") |
| 91 |
fi |
| 92 |
done |
Archives