diff options
Diffstat (limited to 'classes/openjdk-build-helper.bbclass')
| -rw-r--r-- | classes/openjdk-build-helper.bbclass | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/classes/openjdk-build-helper.bbclass b/classes/openjdk-build-helper.bbclass index 4e334c2..1aeca8d 100644 --- a/classes/openjdk-build-helper.bbclass +++ b/classes/openjdk-build-helper.bbclass @@ -2,8 +2,8 @@ # 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}" +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, @@ -45,7 +45,7 @@ def openjdk_build_helper_get_target_cflags(d): # doesn't work anyway. version = d.getVar('GCCVERSION')[0] # skip non digit characters at the beginning, e.g. from "linaro-6.2%" - match = re.search("\d", version) + match = re.search(r"\d", version) if match: version = version[match.start():] return openjdk_build_helper_get_cflags_by_cc_version(d, version) @@ -83,7 +83,7 @@ def openjdk_build_helper_get_llvm_configure_arch(d): elif arch == "arm": arch = "arm" else: - if 'shark' in d.getVar('PACKAGECONFIG').split(): + if bb.utils.contains('PACKAGECONFIG', 'shark', True, False, d): bb.warn("%s does not support %s in Shark builds yet" % (d.getVar('PN'), arch) ); return arch |