Misc fixes for jamvm.

This commit is contained in:
Andrius Štikonas 2019-11-23 09:21:05 +02:00
parent 9d04a317ac
commit c30074a20d
5 changed files with 14 additions and 11 deletions

View File

@ -1,3 +1,3 @@
DIST classpath-0.93.tar.gz 9534222 BLAKE2B 36313f25e165856a8716c18873d725d82f52e20310d2c22ca0b0b0a481e66a00ccad4138c76e96c119772565819bc06cd626bc100ddea0684d04165e10206541 SHA512 69d831361085514bb7c5607fa694914cc01bc9fe589b7744d5534c97d434722193a1b68a336642d0dba9a3b50e9acea0364741790e9f19d196e5956a51c320b0
EBUILD gnu-classpath-0.93.ebuild 1151 BLAKE2B a9b3a1a004b664e5fe5bb92e37d37ff331c85834b8e3987359e4771345e889ff8add23540607747846ce10e704b69bba5cf8f9ad785dbdbd6182ef5382740681 SHA512 5ab2eeae5fc5962c324db55e798ccc4f4de998580edcfda858ce9f0b38eaacdf20f30203d332b8c8d818663f6063b2c8a7324af8455458b021059a4d5feb93c2
EBUILD gnu-classpath-0.93.ebuild 1093 BLAKE2B e81893c8cda4174ed7b905f4b002eae4a69a13c16fed19f8c7db576fc79325557cb9269b3e3b9449abda834605259d9db37481fdf0d2d19cc425a9ed92bd021e SHA512 763b7345e5568f8e3a2ebb43fccf20331e12eb93fe5157835e5109bd5b42bd3774aeb1059ef74e789eaa1e24cbe48a5fb152f8c49803764a43f18fe4a37d249f
MISC metadata.xml 252 BLAKE2B a3a36edd6c0b4e630f0e38d236ff4133a5c6b4aa42f5525d8a0978ecdbbe3d53602d3fcde02cf1a495bfabb4fd06f914826df44bda7f542ce8543b32fd7bbfe2 SHA512 1ab83f56876901e45f2b34aa5c81bd1d7b243009236d238b49fca2d49ec167c596ea589de6df1c8dfe1a6b834a2e0e493409ee65d499bd2b6ecaf687ae71df69

View File

@ -35,9 +35,8 @@ src_configure() {
--disable-dssi \
--disable-alsa \
--disable-gjdoc \
--prefix="${EPREFIX}"/usr/${PN}-${SLOT} \
--bindir="${EPREFIX}"/usr/libexec/${PN} \
--with-glibj-dir="${EPREFIX}"/usr/${PN}-${SLOT}/share/classpath \
--with-glibj-dir="${EPREFIX}"/usr/share/classpath \
--includedir="${EPREFIX}"/usr/include/classpath
}

View File

@ -1,5 +1,5 @@
AUX classes-location.patch 1184 BLAKE2B 367fad8488bf6866021aade628221a7ce53a000fc6cba0b59bbe4b2145d30a07cb6d057dcc7a4ea370f82926e0171021e50691ce35959b129802ad38d441983d SHA512 0e441916dbf66289bea37da807a85930a9fe320b5c3a5301df85a870418125fe9fe0c5fb7ce7e4baa9dfc75a3438509e9d77b0ede67b06411935875ec7e641ee
AUX jamvm-1.5.1.env 361 BLAKE2B acfc04a4fcc035d7ce2b0e3eba3b7cbaa3f50ac857f3c45c2c31e0ecb7509a298847b055649a2cfa79981a247749f87dbcf3551d0d404c8f7ff30ac6670f217e SHA512 3965b3dd8a27f9330e2eee24bdfd4e4280d5e06495a2f78e57ccee561cab9a219b554fc89a53bbf5c5e5c6fdabf4de96ca7d82435872d9991b17f60d02b3f7d4
AUX jamvm-1.5.1.env 378 BLAKE2B 0d35f75ab71d3ecfd194c47eade38076cbd1856c009692e6c959712546aeb845f445914bc4005660ad4209a0faeb3327bb818a9a89b5b6e575b42da215f899b0 SHA512 c71b3a1f689778e67fd977bc7f338784868bf09d6fd0444d1b23da8abc3e8d8d93e01e85a840420c6efa89af3676327c2f1bf93dc62a2c35a7ee314542a89a41
DIST jamvm-1.5.1.tar.gz 599084 BLAKE2B af79d5615fbfa395230d93ec52fd70f6000d85eac881414f59ab9f33ab4393a4dadbfa6966c574d11422612e10354bec562b3728e4a8fe6e6334b5c0f2742ed9 SHA512 9f93611fefb28b5494d166d7ec9575eb8d12add775dd65b2b46303355e3f845f417d5301649a1f09cb306e6690cd82b67cb1dface30ce18d0b2ecc815d3bc9b9
EBUILD jamvm-1.5.1.ebuild 1475 BLAKE2B feddf8650c5200aac03384afbb3b95b60c4fbacee3a923180527808c376fa6e520f0d3182d418ab8088d0a068a81a110c8d6217a73bd4dbc53b962d9d1772567 SHA512 df7ebf50644f959851c8f0a8e4ee1f3966fd9721361f9ba4eb224ba6a341776442f9d5419dab6ed37cfc9cae0fc382bc0c69fd9d71abd9b35fbf8e07000f5fc5
EBUILD jamvm-1.5.1.ebuild 1470 BLAKE2B fa7c7079125bf92c1c906a082ee6ee9e485c8d3cc540492896383f3a8b7b6654d12de05d0a66ea6f00c5593685e4bfbb05390e19b19a32bc25c0666034734bd4 SHA512 0a33757fa430565518200c7f9f02a40626c11a45acdde2a4a4a3351fead64de369867b570a69411cd0bfd88d0168fad1d50c2690516141edd8e71decdea2048d
MISC metadata.xml 252 BLAKE2B a3a36edd6c0b4e630f0e38d236ff4133a5c6b4aa42f5525d8a0978ecdbbe3d53602d3fcde02cf1a495bfabb4fd06f914826df44bda7f542ce8543b32fd7bbfe2 SHA512 1ab83f56876901e45f2b34aa5c81bd1d7b243009236d238b49fca2d49ec167c596ea589de6df1c8dfe1a6b834a2e0e493409ee65d499bd2b6ecaf687ae71df69

View File

@ -1,6 +1,6 @@
VERSION="JamVM @PV@"
JAVA_HOME=/usr/@PN@
BOOTCLASSPATH="/usr/share/@PN@/classes.zip:/usr/gnu-classpath-0.93/share/classpath/glibj.zip"
BOOTCLASSPATH="/usr/share/@PN@/classes.zip:/usr/share/classpath/glibj.zip"
JDK_HOME=/usr/@PN@
JAVAC=${JAVA_HOME}/bin/javac
PATH="${JAVA_HOME}/bin"
@ -8,5 +8,5 @@ ROOTPATH="${JAVA_HOME}/bin"
PROVIDES_TYPE="JDK JRE"
PROVIDES_VERSION="1.4"
GENERATION="2"
ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH"
LDPATH="/usr/@PN@/lib"
LDPATH="/usr/@PN@/@LIBDIR@:/usr/@LIBDIR@/classpath"
ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH LDPATH"

View File

@ -22,10 +22,14 @@ src_unpack() {
unpack ${A}
}
CLASSPATH_DIR="${EPREFIX}/usr/gnu-classpath-${CLASSPATH_SLOT}"
src_prepare() {
rm -v lib/classes.zip || die
default
}
src_configure() {
export JAVAC="${EPREFIX}/usr/bin/jikes"
export JAVAC="${EPREFIX}/usr/bin/jikes-bin"
epatch "${FILESDIR}/classes-location.patch"
eautoreconf
@ -40,7 +44,7 @@ src_configure() {
--prefix=/usr/${PN} \
--datadir=/usr/share \
--bindir=/usr/bin \
--with-classpath-install-dir=${CLASSPATH_DIR} \
--with-classpath-install-dir="${EPREFIX}/usr" \
|| die "configure failed."
}