summaryrefslogtreecommitdiffstats
path: root/recipes-core/openjdk/openjdk-common.inc
diff options
context:
space:
mode:
authorCody P Schafer <dev@codyps.com>2016-11-29 11:48:17 -0500
committerOtavio Salvador <otavio@ossystems.com.br>2016-12-06 16:25:08 -0200
commit2a3cd732ce7efea9f372862be7ef70ff5ecb50d9 (patch)
tree6fd21a770c2aab45a08a38c3167636e465cd401d /recipes-core/openjdk/openjdk-common.inc
parenta70bf4a9e3e1c03ff1cc2d0db228a383943c54db (diff)
downloadmeta-java-2a3cd732ce7efea9f372862be7ef70ff5ecb50d9.tar.gz
move from bb.data.getVar(x, d, 1) to d.getVar(x, True)
bb.data.getVar was removed, need to use the modern mechanism. Signed-off-by: Cody P Schafer <dev@codyps.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'recipes-core/openjdk/openjdk-common.inc')
-rw-r--r--recipes-core/openjdk/openjdk-common.inc6
1 files changed, 3 insertions, 3 deletions
diff --git a/recipes-core/openjdk/openjdk-common.inc b/recipes-core/openjdk/openjdk-common.inc
index 6a72572..cdfdda8 100644
--- a/recipes-core/openjdk/openjdk-common.inc
+++ b/recipes-core/openjdk/openjdk-common.inc
@@ -25,7 +25,7 @@ B = "${S}/build"
25def get_jdk_arch(d): 25def get_jdk_arch(d):
26 import bb 26 import bb
27 27
28 jdk_arch = bb.data.getVar('TRANSLATED_TARGET_ARCH', d, 1) 28 jdk_arch = d.getVar('TRANSLATED_TARGET_ARCH', True)
29 if jdk_arch == "x86-64": 29 if jdk_arch == "x86-64":
30 jdk_arch = "amd64" 30 jdk_arch = "amd64"
31 elif jdk_arch == "powerpc": 31 elif jdk_arch == "powerpc":
@@ -45,7 +45,7 @@ JDK_FAKE = "${WORKDIR}/fake-jdk"
45def get_llvm_configure_arch(d): 45def get_llvm_configure_arch(d):
46 import bb; 46 import bb;
47 47
48 arch = bb.data.getVar('TRANSLATED_TARGET_ARCH', d, 1) 48 arch = d.getVar('TRANSLATED_TARGET_ARCH', True)
49 if arch == "x86-64" or arch == "i486" or arch == "i586" or arch == "i686": 49 if arch == "x86-64" or arch == "i486" or arch == "i586" or arch == "i686":
50 arch = "x86" 50 arch = "x86"
51 elif arch == "arm": 51 elif arch == "arm":
@@ -55,7 +55,7 @@ def get_llvm_configure_arch(d):
55 elif arch == "powerpc" or arch == "powerpc64": 55 elif arch == "powerpc" or arch == "powerpc64":
56 arch = "powerpc" 56 arch = "powerpc"
57 else: 57 else:
58 bb.warn("%s does not support %s yet" % (bb.data.getVar('PN', d, 1), arch) ); 58 bb.warn("%s does not support %s yet" % (d.getVar('PN', True), arch) );
59 59
60 return arch 60 return arch
61 61