summaryrefslogtreecommitdiffstats
path: root/recipes-core/openjdk/openjdk-8-common.inc
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-core/openjdk/openjdk-8-common.inc')
-rw-r--r--recipes-core/openjdk/openjdk-8-common.inc10
1 files changed, 5 insertions, 5 deletions
diff --git a/recipes-core/openjdk/openjdk-8-common.inc b/recipes-core/openjdk/openjdk-8-common.inc
index c339985..def779d 100644
--- a/recipes-core/openjdk/openjdk-8-common.inc
+++ b/recipes-core/openjdk/openjdk-8-common.inc
@@ -171,7 +171,7 @@ do_configure_prepend() {
171def get_llvm_configure_arch(d): 171def get_llvm_configure_arch(d):
172 import bb; 172 import bb;
173 173
174 arch = bb.data.getVar('TRANSLATED_TARGET_ARCH', d, 1) 174 arch = d.getVar('TRANSLATED_TARGET_ARCH', True)
175 if arch == "x86-64" or arch == "i486" or arch == "i586" or arch == "i686": 175 if arch == "x86-64" or arch == "i486" or arch == "i586" or arch == "i686":
176 arch = "x86" 176 arch = "x86"
177 elif arch == "arm": 177 elif arch == "arm":
@@ -181,7 +181,7 @@ def get_llvm_configure_arch(d):
181 elif arch == "powerpc" or arch == "powerpc64": 181 elif arch == "powerpc" or arch == "powerpc64":
182 arch = "powerpc" 182 arch = "powerpc"
183 else: 183 else:
184 bb.warn("%s does not support %s yet" % (bb.data.getVar('PN', d, 1), arch) ); 184 bb.warn("%s does not support %s yet" % (d.getVar('PN', True), arch) );
185 185
186 return arch 186 return arch
187 187
@@ -193,7 +193,7 @@ export LLVM_CONFIGURE_ARCH="${@get_llvm_configure_arch(d)}"
193def get_jdk_arch(d): 193def get_jdk_arch(d):
194 import bb 194 import bb
195 195
196 jdk_arch = bb.data.getVar('TRANSLATED_TARGET_ARCH', d, 1) 196 jdk_arch = d.getVar('TRANSLATED_TARGET_ARCH', True)
197 if jdk_arch == "x86-64": 197 if jdk_arch == "x86-64":
198 jdk_arch = "amd64" 198 jdk_arch = "amd64"
199 elif jdk_arch == "powerpc": 199 elif jdk_arch == "powerpc":
@@ -211,8 +211,8 @@ export DEBUG_BINARIES = "true"
211 211
212ALTERNATIVE_PRIORITY = "50" 212ALTERNATIVE_PRIORITY = "50"
213 213
214OPENJDK_UPDATE_VERSION = "${@bb.data.getVar('PV', d, 1).split('b')[0]}" 214OPENJDK_UPDATE_VERSION = "${@d.getVar('PV', True).split('b')[0]}"
215OPENJDK_BUILD_NUMBER = "b${@bb.data.getVar('PV', d, 1).split('b')[1]}" 215OPENJDK_BUILD_NUMBER = "b${@d.getVar('PV', True).split('b')[1]}"
216EXTRA_OECONF_append = "\ 216EXTRA_OECONF_append = "\
217 --with-build-number=${OPENJDK_BUILD_NUMBER} \ 217 --with-build-number=${OPENJDK_BUILD_NUMBER} \
218 --with-update-version=${OPENJDK_UPDATE_VERSION} \ 218 --with-update-version=${OPENJDK_UPDATE_VERSION} \