diff options
-rw-r--r-- | classes/java-library.bbclass | 4 | ||||
-rw-r--r-- | classes/openjdk-build-helper.bbclass | 10 | ||||
-rw-r--r-- | recipes-core/openjdk/openjdk-7-common.inc | 2 | ||||
-rw-r--r-- | recipes-core/openjdk/openjdk-8-common.inc | 4 | ||||
-rw-r--r-- | recipes-core/openjdk/openjdk-8-cross.inc | 10 |
5 files changed, 15 insertions, 15 deletions
diff --git a/classes/java-library.bbclass b/classes/java-library.bbclass index e0159ba..d801930 100644 --- a/classes/java-library.bbclass +++ b/classes/java-library.bbclass | |||
@@ -27,8 +27,8 @@ def java_package_name(d): | |||
27 | pre="" | 27 | pre="" |
28 | post="" | 28 | post="" |
29 | 29 | ||
30 | bpn = d.getVar('BPN', True) | 30 | bpn = d.getVar('BPN') |
31 | ml = d.getVar('MLPREFIX', True) | 31 | ml = d.getVar('MLPREFIX') |
32 | if not bpn.startswith("lib"): | 32 | if not bpn.startswith("lib"): |
33 | pre='lib' | 33 | pre='lib' |
34 | 34 | ||
diff --git a/classes/openjdk-build-helper.bbclass b/classes/openjdk-build-helper.bbclass index 01ed591..8d83e02 100644 --- a/classes/openjdk-build-helper.bbclass +++ b/classes/openjdk-build-helper.bbclass | |||
@@ -9,7 +9,7 @@ EXTRA_OEMAKE_remove_task-install = "${PARALLEL_MAKEINST}" | |||
9 | # In OE we have PARALLEL_MAKE which is the actual option passed to make, | 9 | # In OE we have PARALLEL_MAKE which is the actual option passed to make, |
10 | # e.g. "-j 4". | 10 | # e.g. "-j 4". |
11 | def openjdk_build_helper_get_parallel_make(d): | 11 | def openjdk_build_helper_get_parallel_make(d): |
12 | pm = d.getVar('PARALLEL_MAKE', True); | 12 | pm = d.getVar('PARALLEL_MAKE'); |
13 | if not pm or '-j' not in pm: | 13 | if not pm or '-j' not in pm: |
14 | return 1 | 14 | return 1 |
15 | 15 | ||
@@ -55,7 +55,7 @@ def openjdk_build_helper_get_target_cflags(d): | |||
55 | def openjdk_build_helper_get_jdk_arch(d): | 55 | def openjdk_build_helper_get_jdk_arch(d): |
56 | import bb | 56 | import bb |
57 | 57 | ||
58 | jdk_arch = d.getVar('TRANSLATED_TARGET_ARCH', True) | 58 | jdk_arch = d.getVar('TRANSLATED_TARGET_ARCH') |
59 | if jdk_arch == "x86-64": | 59 | if jdk_arch == "x86-64": |
60 | jdk_arch = "amd64" | 60 | jdk_arch = "amd64" |
61 | elif jdk_arch == "powerpc": | 61 | elif jdk_arch == "powerpc": |
@@ -73,7 +73,7 @@ def openjdk_build_helper_get_jdk_arch(d): | |||
73 | def openjdk_build_helper_get_llvm_configure_arch(d): | 73 | def openjdk_build_helper_get_llvm_configure_arch(d): |
74 | import bb; | 74 | import bb; |
75 | 75 | ||
76 | arch = d.getVar('TRANSLATED_TARGET_ARCH', True) | 76 | arch = d.getVar('TRANSLATED_TARGET_ARCH') |
77 | if arch in ['i386', 'i486', 'i586', 'i686', 'x86-64']: | 77 | if arch in ['i386', 'i486', 'i586', 'i686', 'x86-64']: |
78 | arch = "x86" | 78 | arch = "x86" |
79 | elif arch in ['mipsel', 'mips']: | 79 | elif arch in ['mipsel', 'mips']: |
@@ -84,7 +84,7 @@ def openjdk_build_helper_get_llvm_configure_arch(d): | |||
84 | arch = "arm" | 84 | arch = "arm" |
85 | else: | 85 | else: |
86 | if 'shark' in d.getVar('PACKAGECONFIG').split(): | 86 | if 'shark' in d.getVar('PACKAGECONFIG').split(): |
87 | bb.warn("%s does not support %s in Shark builds yet" % (d.getVar('PN', True), arch) ); | 87 | bb.warn("%s does not support %s in Shark builds yet" % (d.getVar('PN'), arch) ); |
88 | 88 | ||
89 | return arch | 89 | return arch |
90 | 90 | ||
@@ -93,7 +93,7 @@ def openjdk_build_helper_get_llvm_configure_arch(d): | |||
93 | def openjdk_build_helper_get_icedtea_arch(d): | 93 | def openjdk_build_helper_get_icedtea_arch(d): |
94 | import bb; | 94 | import bb; |
95 | 95 | ||
96 | arch = d.getVar('TRANSLATED_TARGET_ARCH', True) | 96 | arch = d.getVar('TRANSLATED_TARGET_ARCH') |
97 | if arch == "x86-64": | 97 | if arch == "x86-64": |
98 | arch = "amd64" | 98 | arch = "amd64" |
99 | elif arch in ['i386', 'i486', 'i586', 'i686']: | 99 | elif arch in ['i386', 'i486', 'i586', 'i686']: |
diff --git a/recipes-core/openjdk/openjdk-7-common.inc b/recipes-core/openjdk/openjdk-7-common.inc index 794bf58..d59a57a 100644 --- a/recipes-core/openjdk/openjdk-7-common.inc +++ b/recipes-core/openjdk/openjdk-7-common.inc | |||
@@ -93,7 +93,7 @@ export ALT_CUPS_HEADERS_PATH = "${STAGING_INCDIR}" | |||
93 | export ALT_FREETYPE_HEADERS_PATH = "${STAGING_INCDIR}/freetype2" | 93 | export ALT_FREETYPE_HEADERS_PATH = "${STAGING_INCDIR}/freetype2" |
94 | export ALT_FREETYPE_LIB_PATH = "${STAGING_LIBDIR}" | 94 | export ALT_FREETYPE_LIB_PATH = "${STAGING_LIBDIR}" |
95 | export CACAO_CONFIGURE_ARGS = " \ | 95 | export CACAO_CONFIGURE_ARGS = " \ |
96 | ${@['','--enable-softfloat'][d.getVar('TARGET_FPU', True) == 'soft']}" | 96 | ${@['','--enable-softfloat'][d.getVar('TARGET_FPU') == 'soft']}" |
97 | 97 | ||
98 | JAVA_HOME[unexport] = "1" | 98 | JAVA_HOME[unexport] = "1" |
99 | 99 | ||
diff --git a/recipes-core/openjdk/openjdk-8-common.inc b/recipes-core/openjdk/openjdk-8-common.inc index 4d8f935..1fbe7fe 100644 --- a/recipes-core/openjdk/openjdk-8-common.inc +++ b/recipes-core/openjdk/openjdk-8-common.inc | |||
@@ -163,8 +163,8 @@ export DEBUG_BINARIES = "true" | |||
163 | 163 | ||
164 | ALTERNATIVE_PRIORITY = "50" | 164 | ALTERNATIVE_PRIORITY = "50" |
165 | 165 | ||
166 | OPENJDK_UPDATE_VERSION = "${@d.getVar('PV', True).split('b')[0]}" | 166 | OPENJDK_UPDATE_VERSION = "${@d.getVar('PV').split('b')[0]}" |
167 | OPENJDK_BUILD_NUMBER = "b${@d.getVar('PV', True).split('b')[1]}" | 167 | OPENJDK_BUILD_NUMBER = "b${@d.getVar('PV').split('b')[1]}" |
168 | EXTRA_OECONF_append = "\ | 168 | EXTRA_OECONF_append = "\ |
169 | --with-build-number=${OPENJDK_BUILD_NUMBER} \ | 169 | --with-build-number=${OPENJDK_BUILD_NUMBER} \ |
170 | --with-update-version=${OPENJDK_UPDATE_VERSION} \ | 170 | --with-update-version=${OPENJDK_UPDATE_VERSION} \ |
diff --git a/recipes-core/openjdk/openjdk-8-cross.inc b/recipes-core/openjdk/openjdk-8-cross.inc index 7552930..18b99fd 100644 --- a/recipes-core/openjdk/openjdk-8-cross.inc +++ b/recipes-core/openjdk/openjdk-8-cross.inc | |||
@@ -110,14 +110,14 @@ EXTRA_OEMAKE_append = '\ | |||
110 | ' | 110 | ' |
111 | 111 | ||
112 | python remove_debuglink() { | 112 | python remove_debuglink() { |
113 | dvar = d.getVar('PKGD', True) | 113 | dvar = d.getVar('PKGD') |
114 | objcopy = d.getVar("OBJCOPY", True) | 114 | objcopy = d.getVar("OBJCOPY") |
115 | 115 | ||
116 | # Remove the previous debuglink if it has existed, because it has a different file name with that we will add. | 116 | # Remove the previous debuglink if it has existed, because it has a different file name with that we will add. |
117 | if d.getVar('PN', True).find("jre") != -1: | 117 | if d.getVar('PN').find("jre") != -1: |
118 | file = dvar + d.getVar("JRE_HOME", True) + "/lib/" + d.getVar("JDK_ARCH", True) + "/server/libjvm.so" | 118 | file = dvar + d.getVar("JRE_HOME") + "/lib/" + d.getVar("JDK_ARCH") + "/server/libjvm.so" |
119 | else: | 119 | else: |
120 | file = dvar + d.getVar("JDK_HOME", True) + "/jre/lib/" + d.getVar("JDK_ARCH", True) + "/server/libjvm.so" | 120 | file = dvar + d.getVar("JDK_HOME") + "/jre/lib/" + d.getVar("JDK_ARCH") + "/server/libjvm.so" |
121 | 121 | ||
122 | cmd = "'%s' --remove-section .gnu_debuglink '%s'" % (objcopy, file) | 122 | cmd = "'%s' --remove-section .gnu_debuglink '%s'" % (objcopy, file) |
123 | oe.utils.getstatusoutput(cmd) | 123 | oe.utils.getstatusoutput(cmd) |