summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Heinold <heinold@inf.fu-berlin.de>2012-07-19 17:34:53 +0200
committerHenning Heinold <heinold@inf.fu-berlin.de>2012-07-19 17:42:06 +0200
commit8e11ccd8a46abcf46fe3854d40ead208b5605b53 (patch)
treea6c76f2d7965aa9db1ebcbf628789f44e66578b3
parent488f15ff25dcaf90be6657df579221c36fc586db (diff)
downloadmeta-java-8e11ccd8a46abcf46fe3854d40ead208b5605b53.tar.gz
llvm: use spaces for python functions
-rw-r--r--recipes-core/llvm/llvm.inc66
1 files changed, 32 insertions, 34 deletions
diff --git a/recipes-core/llvm/llvm.inc b/recipes-core/llvm/llvm.inc
index 5a46092..185b894 100644
--- a/recipes-core/llvm/llvm.inc
+++ b/recipes-core/llvm/llvm.inc
@@ -85,9 +85,8 @@ PACKAGES_virtclass-native = ""
85PACKAGES_DYNAMIC_virtclass-native = "" 85PACKAGES_DYNAMIC_virtclass-native = ""
86 86
87python populate_packages_prepend () { 87python populate_packages_prepend () {
88 libllvm_libdir = bb.data.expand('${libdir}/llvm${LLVM_RELEASE}', d) 88 libllvm_libdir = bb.data.expand('${libdir}/llvm${LLVM_RELEASE}', d)
89 89 do_split_packages(d, libllvm_libdir, '^lib(.*)\.so$', 'libllvm-%s', 'Split package for %s', allow_dirs=True)
90 do_split_packages(d, libllvm_libdir, '^lib(.*)\.so$', 'libllvm-%s', 'Split package for %s', allow_dirs=True)
91} 90}
92 91
93FILES_${PN} = "" 92FILES_${PN} = ""
@@ -104,25 +103,25 @@ FILES_${PN}-dev = " \
104 " 103 "
105 104
106do_install() { 105do_install() {
107 # Install into a private directory to be able to reorganize the files. 106 # Install into a private directory to be able to reorganize the files.
108 107
109 cd ${OECMAKE_BUILDPATH} 108 cd ${OECMAKE_BUILDPATH}
110 109
111 oe_runmake DESTDIR=${WORKDIR}/llvm-install install 110 oe_runmake DESTDIR=${WORKDIR}/llvm-install install
112 111
113 # Create our custom target directories 112 # Create our custom target directories
114 install -d ${D}${bindir}/llvm${LLVM_RELEASE} 113 install -d ${D}${bindir}/llvm${LLVM_RELEASE}
115 install -d ${D}${includedir}/llvm${LLVM_RELEASE} 114 install -d ${D}${includedir}/llvm${LLVM_RELEASE}
116 install -d ${D}${libdir}/llvm${LLVM_RELEASE} 115 install -d ${D}${libdir}/llvm${LLVM_RELEASE}
117 116
118 # Move headers into their own directory 117 # Move headers into their own directory
119 cp -R ${WORKDIR}/llvm-install/${prefix}/include/llvm \ 118 cp -R ${WORKDIR}/llvm-install/${prefix}/include/llvm \
120 ${D}${includedir}/llvm${LLVM_RELEASE}/ 119 ${D}${includedir}/llvm${LLVM_RELEASE}/
121 cp -R ${WORKDIR}/llvm-install/${prefix}/include/llvm-c \ 120 cp -R ${WORKDIR}/llvm-install/${prefix}/include/llvm-c \
122 ${D}${includedir}/llvm${LLVM_RELEASE}/ 121 ${D}${includedir}/llvm${LLVM_RELEASE}/
123 122
124 find ${WORKDIR}/llvm-install/${prefix}/lib -name "*" -maxdepth 1 -exec \ 123 find ${WORKDIR}/llvm-install/${prefix}/lib -name "*" -maxdepth 1 -exec \
125 install {} ${D}${libdir}/llvm${LLVM_RELEASE} \; 124 install {} ${D}${libdir}/llvm${LLVM_RELEASE} \;
126 125
127 # I dont know another way out. Binaries are installed into a special subdir 126 # I dont know another way out. Binaries are installed into a special subdir
128 find ${WORKDIR}/llvm-install/${prefix}/bin -name "*" -maxdepth 1 -exec \ 127 find ${WORKDIR}/llvm-install/${prefix}/bin -name "*" -maxdepth 1 -exec \
@@ -148,7 +147,7 @@ do_install() {
148 install -d ${SYSROOT_DESTDIR}${bindir_crossscripts} 147 install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}
149 install -m 0755 bin/llvm-config${LLVM_RELEASE} ${SYSROOT_DESTDIR}${bindir_crossscripts} 148 install -m 0755 bin/llvm-config${LLVM_RELEASE} ${SYSROOT_DESTDIR}${bindir_crossscripts}
150} 149}
151 150
152do_install_virtclass-native() { 151do_install_virtclass-native() {
153 # Install into a private directory to be able to reorganize the files. 152 # Install into a private directory to be able to reorganize the files.
154 153
@@ -194,22 +193,21 @@ do_install_virtclass-native() {
194# Retrieve the target in a way that is compatible to the arch 193# Retrieve the target in a way that is compatible to the arch
195# value in llvm (>= 2.5) 194# value in llvm (>= 2.5)
196def get_llvm_arch(d): 195def get_llvm_arch(d):
197 import bb; 196 import bb;
198 197
199 arch = bb.data.getVar('TARGET_ARCH', d, 1) 198 arch = bb.data.getVar('TARGET_ARCH', d, 1)
200 if arch == "x86_64" or arch == "i486" or arch == "i586" or arch == "i686": 199 if arch == "x86_64" or arch == "i486" or arch == "i586" or arch == "i686":
201 arch = "X86" 200 arch = "X86"
202 elif arch == "arm": 201 elif arch == "arm":
203 arch = "ARM" 202 arch = "ARM"
204 elif arch == "mipsel" or arch == "mips": 203 elif arch == "mipsel" or arch == "mips":
205 arch = "mips" 204 arch = "mips"
206 elif arch == "powerpc": 205 elif arch == "powerpc":
207 arch = "PowerPC" 206 arch = "PowerPC"
208 else: 207 else:
209 bb.error("%s does not support %s yet" % (bb.data.getVar('PN', d, 1), arch) ); 208 bb.error("%s does not support %s yet" % (bb.data.getVar('PN', d, 1), arch) );
210 209
211 return arch 210 return arch
212
213 211
214BBCLASSEXTEND = "native" 212BBCLASSEXTEND = "native"
215 213