diff options
Diffstat (limited to 'classes/openjdk-build-helper.bbclass')
| -rw-r--r-- | classes/openjdk-build-helper.bbclass | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/classes/openjdk-build-helper.bbclass b/classes/openjdk-build-helper.bbclass index 01ed591..1aeca8d 100644 --- a/classes/openjdk-build-helper.bbclass +++ b/classes/openjdk-build-helper.bbclass @@ -2,14 +2,14 @@ # 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, # e.g. "-j 4". def openjdk_build_helper_get_parallel_make(d): - pm = d.getVar('PARALLEL_MAKE', True); + pm = d.getVar('PARALLEL_MAKE'); if not pm or '-j' not in pm: return 1 @@ -31,7 +31,7 @@ def openjdk_build_helper_get_build_cflags(d): from subprocess import Popen, PIPE cmd = d.expand('%s -dumpversion' % build_cc).split() cc = Popen(cmd, stdout=PIPE, stderr=PIPE) - return cc.communicate()[0].decode('utf-8')[0] + return cc.communicate()[0].decode('utf-8').split()[0] build_cc = d.getVar('BUILD_CC') version = get_build_cc_version(build_cc) @@ -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) @@ -55,7 +55,7 @@ def openjdk_build_helper_get_target_cflags(d): def openjdk_build_helper_get_jdk_arch(d): import bb - jdk_arch = d.getVar('TRANSLATED_TARGET_ARCH', True) + jdk_arch = d.getVar('TRANSLATED_TARGET_ARCH') if jdk_arch == "x86-64": jdk_arch = "amd64" elif jdk_arch == "powerpc": @@ -73,7 +73,7 @@ def openjdk_build_helper_get_jdk_arch(d): def openjdk_build_helper_get_llvm_configure_arch(d): import bb; - arch = d.getVar('TRANSLATED_TARGET_ARCH', True) + arch = d.getVar('TRANSLATED_TARGET_ARCH') if arch in ['i386', 'i486', 'i586', 'i686', 'x86-64']: arch = "x86" elif arch in ['mipsel', 'mips']: @@ -83,8 +83,8 @@ def openjdk_build_helper_get_llvm_configure_arch(d): elif arch == "arm": arch = "arm" else: - if 'shark' in d.getVar('PACKAGECONFIG').split(): - bb.warn("%s does not support %s in Shark builds yet" % (d.getVar('PN', True), arch) ); + 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 @@ -93,7 +93,7 @@ def openjdk_build_helper_get_llvm_configure_arch(d): def openjdk_build_helper_get_icedtea_arch(d): import bb; - arch = d.getVar('TRANSLATED_TARGET_ARCH', True) + arch = d.getVar('TRANSLATED_TARGET_ARCH') if arch == "x86-64": arch = "amd64" elif arch in ['i386', 'i486', 'i586', 'i686']: |