summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Heinold <heinold@inf.fu-berlin.de>2012-07-19 17:58:50 +0200
committerHenning Heinold <heinold@inf.fu-berlin.de>2012-07-19 17:58:50 +0200
commitf9e2162b34984aa84097a5e381ca20fc58f19ed6 (patch)
tree23cc3f33b9059fdefb766a0012b77e49596debda
parent599ea8aa7c26209df737900438876aa3f457dedc (diff)
downloadmeta-java-f9e2162b34984aa84097a5e381ca20fc58f19ed6.tar.gz
openjdk6: uses spaces instead of tabs for python functions
-rw-r--r--recipes-core/openjdk/openjdk-6-common.inc62
1 files changed, 31 insertions, 31 deletions
diff --git a/recipes-core/openjdk/openjdk-6-common.inc b/recipes-core/openjdk/openjdk-6-common.inc
index 9d7e810..d81543c 100644
--- a/recipes-core/openjdk/openjdk-6-common.inc
+++ b/recipes-core/openjdk/openjdk-6-common.inc
@@ -104,15 +104,15 @@ EXTRA_OECONF = "\
104# OpenJDK uses slightly different names for certain arches. We need to know 104# OpenJDK uses slightly different names for certain arches. We need to know
105# this to create some files which are expected by the build. 105# this to create some files which are expected by the build.
106def get_jdk_arch(d): 106def get_jdk_arch(d):
107 import bb 107 import bb
108 108
109 jdk_arch = bb.data.getVar('TARGET_ARCH', d, 1) 109 jdk_arch = bb.data.getVar('TARGET_ARCH', d, 1)
110 if jdk_arch == "x86_64": 110 if jdk_arch == "x86_64":
111 jdk_arch = "amd64" 111 jdk_arch = "amd64"
112 elif (jdk_arch == "i486" or jdk_arch == "i586" or jdk_arch == "i686"): 112 elif (jdk_arch == "i486" or jdk_arch == "i586" or jdk_arch == "i686"):
113 jdk_arch = "i386" 113 jdk_arch = "i386"
114 114
115 return jdk_arch 115 return jdk_arch
116 116
117JDK_ARCH = "${@get_jdk_arch(d)}" 117JDK_ARCH = "${@get_jdk_arch(d)}"
118JDK_HOME = "${libdir_jvm}/${JDK_DIR}" 118JDK_HOME = "${libdir_jvm}/${JDK_DIR}"
@@ -121,38 +121,38 @@ JDK_HOME = "${libdir_jvm}/${JDK_DIR}"
121# In OE we have PARALLEL_MAKE which is the actual option passed to make, 121# In OE we have PARALLEL_MAKE which is the actual option passed to make,
122# e.g. "-j 4". 122# e.g. "-j 4".
123def get_jdk_jobs(d): 123def get_jdk_jobs(d):
124 import bb 124 import bb
125 125
126 pm = bb.data.getVar('PARALLEL_MAKE', d, 1); 126 pm = bb.data.getVar('PARALLEL_MAKE', d, 1);
127 if not pm: 127 if not pm:
128 return "1" 128 return "1"
129 129
130 pm = pm.split("j"); 130 pm = pm.split("j");
131 if (len(pm) == 2): 131 if (len(pm) == 2):
132 return pm[1] 132 return pm[1]
133 133
134 # Whatever found in PARALLEL_MAKE was not suitable. 134 # Whatever found in PARALLEL_MAKE was not suitable.
135 return "1" 135 return "1"
136 136
137JDK_JOBS = "${@get_jdk_jobs(d)}" 137JDK_JOBS = "${@get_jdk_jobs(d)}"
138 138
139# A function that is needed in the Shark builds. 139# A function that is needed in the Shark builds.
140def get_llvm_configure_arch(d): 140def get_llvm_configure_arch(d):
141 import bb; 141 import bb;
142 142
143 arch = bb.data.getVar('TARGET_ARCH', d, 1) 143 arch = bb.data.getVar('TARGET_ARCH', d, 1)
144 if arch == "x86_64" or arch == "i486" or arch == "i586" or arch == "i686": 144 if arch == "x86_64" or arch == "i486" or arch == "i586" or arch == "i686":
145 arch = "x86" 145 arch = "x86"
146 elif arch == "arm": 146 elif arch == "arm":
147 arch = "arm" 147 arch = "arm"
148 elif arch == "mipsel" or arch == "mips": 148 elif arch == "mipsel" or arch == "mips":
149 arch = "mips" 149 arch = "mips"
150 elif arch == "powerpc": 150 elif arch == "powerpc":
151 arch = "powerpc" 151 arch = "powerpc"
152 else: 152 else:
153 bb.error("%s does not support %s yet" % (bb.data.getVar('PN', d, 1), arch) ); 153 bb.error("%s does not support %s yet" % (bb.data.getVar('PN', d, 1), arch) );
154 154
155 return arch 155 return arch
156 156
157# Custom preparation of the sources which: 157# Custom preparation of the sources which:
158# - cleans up the sources 158# - cleans up the sources