diff options
Diffstat (limited to 'recipes-core/jamvm')
| -rw-r--r-- | recipes-core/jamvm/jamvm-initial-native_1.4.5.bb | 4 | ||||
| -rw-r--r-- | recipes-core/jamvm/jamvm.inc | 28 | ||||
| -rw-r--r-- | recipes-core/jamvm/jamvm_git.bb | 4 |
3 files changed, 18 insertions, 18 deletions
diff --git a/recipes-core/jamvm/jamvm-initial-native_1.4.5.bb b/recipes-core/jamvm/jamvm-initial-native_1.4.5.bb index bf005db..f0348a4 100644 --- a/recipes-core/jamvm/jamvm-initial-native_1.4.5.bb +++ b/recipes-core/jamvm/jamvm-initial-native_1.4.5.bb @@ -20,7 +20,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/jamvm/jamvm-${PV}.tar.gz \ # This uses 32 bit arm, so force the instruction set to arm, not thumb ARM_INSTRUCTION_SET = "arm" -inherit native autotools pkgconfig +inherit autotools pkgconfig native # libdir must be modified so that jamvm-initial and -native # do not interfere @@ -38,7 +38,7 @@ CFLAGS += "-DDEFAULT_MAX_HEAP=512*MB" EXTRA_OEMAKE = "JAVAC=${STAGING_BINDIR_NATIVE}/jikes-initial \ GLIBJ_ZIP=${STAGING_DATADIR_NATIVE}/classpath-inital/glibj.zip \ " -do_install_append() { +do_install:append() { install -d ${D}${bindir}/ install -m 0755 ${WORKDIR}/java-initial ${D}${bindir}/ } diff --git a/recipes-core/jamvm/jamvm.inc b/recipes-core/jamvm/jamvm.inc index b03a5b9..693817f 100644 --- a/recipes-core/jamvm/jamvm.inc +++ b/recipes-core/jamvm/jamvm.inc @@ -4,25 +4,25 @@ LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" DEPENDS = "zlib classpath virtual/javac-native libffi virtual/java-initial-native" -DEPENDS_class-native = "virtual/java-initial-native classpath-initial-native zlib-native classpath-native ecj-initial-native libffi-native" +DEPENDS:class-native = "virtual/java-initial-native classpath-initial-native zlib-native classpath-native ecj-initial-native libffi-native" -RDEPENDS_${PN} = "classpath" -RDEPENDS_${PN}_class-native = "" +RDEPENDS:${PN} = "classpath" +RDEPENDS:${PN}:class-native = "" -PROVIDES_class-native = "virtual/java-native" -RPROVIDES_${PN} = "java2-runtime" -RPROVIDES_${PN}_class-native = "" +PROVIDES:class-native = "virtual/java-native" +RPROVIDES:${PN} = "java2-runtime" +RPROVIDES:${PN}:class-native = "" BBCLASSEXTEND = "native" inherit java autotools update-alternatives pkgconfig relative_symlinks features_check -REQUIRED_DISTRO_FEATURES_class-target = "x11" +REQUIRED_DISTRO_FEATURES:class-target = "x11" # This uses 32 bit arm, so force the instruction set to arm, not thumb ARM_INSTRUCTION_SET = "arm" -do_configure_append_class-native() { +do_configure:append:class-native() { sed -i -e"s|STAGING_LIBDIR_NATIVE|${STAGING_LIBDIR_NATIVE}|g" \ -e "s|STAGING_DATADIR_NATIVE|${STAGING_DATADIR_NATIVE}|g" \ ${WORKDIR}/java @@ -32,28 +32,28 @@ do_configure_append_class-native() { EXTRA_OECONF = "--with-classpath-install-dir=${prefix} --libdir=${libdir}/jamvm --enable-ffi --disable-int-inlining" # Needed for big compilation targets like OpenJDK -CFLAGS_append_class-native = " -DDEFAULT_MAX_HEAP=1024*MB" +CFLAGS:append:class-native = " -DDEFAULT_MAX_HEAP=1024*MB" EXTRA_OEMAKE = "JAVAC=${STAGING_BINDIR_NATIVE}/javac \ GLIBJ_ZIP=${STAGING_DATADIR_NATIVE}/classpath/glibj.zip \ " # Enforce usage of ecj-initial. -EXTRA_OEMAKE_class-native = "JAVAC=${STAGING_BINDIR_NATIVE}/ecj-initial \ +EXTRA_OEMAKE:class-native = "JAVAC=${STAGING_BINDIR_NATIVE}/ecj-initial \ GLIBJ_ZIP=${STAGING_DATADIR_NATIVE}/classpath/glibj.zip \ " -do_install_append_class-native() { +do_install:append:class-native() { install -d ${D}${bindir} install -m 0755 ${WORKDIR}/java ${D}${bindir}/java } PRIVATE_LIBS = "libjvm.so" -INSANE_SKIP_${PN} = "dev-so" +INSANE_SKIP:${PN} = "dev-so" -FILES_${PN} += "${libdir}/jamvm/lib*.so" +FILES:${PN} += "${libdir}/jamvm/lib*.so" -ALTERNATIVE_${PN} = "java" +ALTERNATIVE:${PN} = "java" ALTERNATIVE_TARGET = "${bindir}/jamvm" ALTERNATIVE_PRIORITY = "4" # shared state for jamvm-native does not work diff --git a/recipes-core/jamvm/jamvm_git.bb b/recipes-core/jamvm/jamvm_git.bb index 57f7e64..34861ac 100644 --- a/recipes-core/jamvm/jamvm_git.bb +++ b/recipes-core/jamvm/jamvm_git.bb @@ -6,7 +6,7 @@ require jamvm.inc SRCREV = "6cef41d859fbc9ce7868a97cb2cb5dd2b10b9103" PV = "2.0.0-devel+git${SRCPV}" -SRC_URI = "git://git.code.sf.net/p/jamvm/code;protocol=git \ +SRC_URI = "git://git.code.sf.net/p/jamvm/code;protocol=git;branch=master \ file://jamvm-jni_h-noinst.patch \ file://libffi.patch \ file://jamvm-minmax-heap.patch \ @@ -15,4 +15,4 @@ SRC_URI = "git://git.code.sf.net/p/jamvm/code;protocol=git \ S = "${WORKDIR}/git" -COMPATIBLE_MACHINE_aarch64 = "-" +COMPATIBLE_MACHINE:aarch64 = "-" |