From 3c710bf3a90fde0cf6d590ffefc349bfb9a1c677 Mon Sep 17 00:00:00 2001 From: André Draszik Date: Mon, 13 Aug 2018 16:09:17 +0100 Subject: java.bbclass: move openjdk/icedtea specific code into new class MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The code moved is not relevant to anything using java, just for compiling java itself. It doesn't make sense to have here. Move it into openjdk-build-helper Signed-off-by: André Draszik Signed-off-by: Richard Leitner --- classes/java.bbclass | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'classes/java.bbclass') diff --git a/classes/java.bbclass b/classes/java.bbclass index aa012ab..fc97295 100644 --- a/classes/java.bbclass +++ b/classes/java.bbclass @@ -21,23 +21,6 @@ STAGING_DATADIR_JAVA_NATIVE ?= "${STAGING_DATADIR_NATIVE}/java" STAGING_LIBDIR_JNI_NATIVE ?= "${STAGING_LIBDIR_NATIVE}/jni" STAGING_LIBDIR_JVM_NATIVE ?= "${STAGING_LIBDIR_NATIVE}/jvm" -# Icedtea's makefile is not compatible to parallelization so we cannot allow -# passing a valid ${PARALLEL_MAKE} to it. OTOH OpenJDK's makefiles are -# parallelizable and we need ${PARALLEL_MAKE} to derive the proper value. -# The base for this quirk is that GNU Make only considers the last "-j" option. -EXTRA_OEMAKE_remove_task-compile = "${PARALLEL_MAKE}" -EXTRA_OEMAKE_remove_task-install = "${PARALLEL_MAKEINST}" - -# OpenJDK supports parallel compilation but uses a plain number for this. -# In OE we have PARALLEL_MAKE which is the actual option passed to make, -# e.g. "-j 4". -def java_get_parallel_make(d): - pm = d.getVar('PARALLEL_MAKE', True); - if not pm or '-j' not in pm: - return 1 - - return pm.partition('-j')[2].strip().split(' ')[0] - oe_jarinstall() { # Purpose: Install a jar file and create all the given symlinks to it. # Example: -- cgit v1.2.3-54-g00ecf