Skip to contentSkip to conversation

llvm3.2: new recipe

PATCH Superseded Jonathan Liu 1 participant 2 messages Jun 3, 2013 – Jun 5, 2013

v4 of 5 Superseded Latest is v5 →

lore
Share & tools
lore

Jonathan Liu

author
#0 lore raw

PATCH v4 1/1 llvm3.2: new recipe

arm_fenv_uclibc.patch was copied from llvm2.9 recipe.

Signed-off-by Jonathan Liu <[email protected]>
---
 .../llvm/llvm3.2/arm_fenv_uclibc.patch             | 14 ++++
 meta-oe/recipes-core/llvm/llvm3.2_3.2.bb           | 97 ++++++++++++++++++++++
 2 files changed, 111 insertions(+)
 create mode 100644 meta-oe/recipes-core/llvm/llvm3.2/arm_fenv_uclibc.patch
 create mode 100644 meta-oe/recipes-core/llvm/llvm3.2_3.2.bb
meta-oe/recipes-core/llvm/llvm3.2/arm_fenv_uclibc.patch new file +14 -0
new file mode 100644
index 0000000..c3ae494
@@ -0,0 +1,14 @@
+Index: llvm-2.9/include/llvm/Support/FEnv.h
+===================================================================
+--- llvm-2.9.orig/include/llvm/Support/FEnv.h	2010-11-29 20:44:50.000000000 +0100
++++ llvm-2.9/include/llvm/Support/FEnv.h	2011-11-18 18:42:22.580161297 +0100
+@@ -17,6 +17,9 @@
+ 
+ #include "llvm/Config/config.h"
+ #include <cerrno>
++
++#undef HAVE_FENV_H
++
+ #ifdef HAVE_FENV_H
+ #include <fenv.h>
+ #endif
meta-oe/recipes-core/llvm/llvm3.2_3.2.bb new file +97 -0

97 lines not on this page · raw message

Signature · 1 line
1.8.2.3
author
#1 lore raw

I have submitted patch V5 which address some issues as follows.

Quoted 36 lines · Jonathan Liu

arm_fenv_uclibc.patch was copied from llvm2.9 recipe.

Signed-off-by Jonathan Liu <[email protected]>
---
 .../llvm/llvm3.2/arm_fenv_uclibc.patch             | 14 ++++
 meta-oe/recipes-core/llvm/llvm3.2_3.2.bb           | 97 ++++++++++++++++++++++
 2 files changed, 111 insertions(+)
 create mode 100644 meta-oe/recipes-core/llvm/llvm3.2/arm_fenv_uclibc.patch
 create mode 100644 meta-oe/recipes-core/llvm/llvm3.2_3.2.bb
meta-oe/recipes-core/llvm/llvm3.2/arm_fenv_uclibc.patch new file +14 -0
new file mode 100644
index 0000000..c3ae494
@@ -0,0 +1,14 @@
+Index: llvm-2.9/include/llvm/Support/FEnv.h
+===================================================================
+--- llvm-2.9.orig/include/llvm/Support/FEnv.h  2010-11-29 20:44:50.000000000 +0100
++++ llvm-2.9/include/llvm/Support/FEnv.h       2011-11-18 18:42:22.580161297 +0100
+@@ -17,6 +17,9 @@
+
+ #include "llvm/Config/config.h"
+ #include <cerrno>
++
++#undef HAVE_FENV_H
++
+ #ifdef HAVE_FENV_H
+ #include <fenv.h>
+ #endif
meta-oe/recipes-core/llvm/llvm3.2_3.2.bb new file +0 -0
new file mode 100644
index 0000000..3b74306

meta-oe/recipes-core/llvm/llvm3.2_3.2.bb line 7

Quoted 7 lines
meta-oe/recipes-core/llvm/llvm3.2_3.2.bb new file +7 -0
@@ -0,0 +1,97 @@
+DESCRIPTION = "The Low Level Virtual Machine"
+HOMEPAGE = "http://llvm.org"
+# 3-clause BSD-like
+LICENSE = "NCSA"
+LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=60fdd7739841f04a2ce2171a726be8f3"
+
+DEPENDS = "libffi llvm-common"

Missing libxml2-native dependency.

Quoted 42 lines
meta-oe/recipes-core/llvm/llvm3.2_3.2.bb new file +42 -0
+
+SRC_URI = "http://llvm.org/releases/${PV}/llvm-${PV}.src.tar.gz"
+SRC_URI_append_libc-uclibc = " file://arm_fenv_uclibc.patch "
+
+SRC_URI[md5sum] = "71610289bbc819e3e15fdd562809a2d7"
+SRC_URI[sha256sum] = "125090c4d26740f1d5e9838477c931ed7d9ad70d599ba265f46f3a42cb066343"
+
+S = "${WORKDIR}/llvm-${PV}.src"
+
+inherit autotools perlnative pythonnative
+
+LLVM_BUILD_DIR = "${WORKDIR}/llvm-${PV}.build"
+LLVM_INSTALL_DIR = "${WORKDIR}/llvm-install"
+LLVM_RELEASE = "3.2"
+LLVM_DIR = "llvm${LLVM_RELEASE}"
+
+EXTRA_OECONF += "--disable-assertions \
+                 --enable-debug-runtime \
+                 --disable-expensive-checks \
+                 --enable-bindings=none \
+                 --enable-keep-symbols \
+                 --enable-libffi \
+                 --enable-optimized \
+                 --enable-shared \
+                 --enable-targets=host-only"
+EXTRA_OEMAKE += "REQUIRES_RTTI=1"
+FILES_${PN} = "${libdir}/lib*.so \
+               ${libdir}/${LLVM_DIR}/*"
+FILES_${PN}-dbg = "${bindir}/${LLVM_DIR}/.debug \
+                   ${libdir}/${LLVM_DIR}/.debug \
+                   ${libdir}/.debug \
+                   /usr/src/debug"
+FILES_${PN}-dev = "${bindir}/${LLVM_DIR} \
+                   ${includedir}/${LLVM_DIR} \
+                   ${libdir}/${LLVM_DIR}/BugpointPasses.so \
+                   ${libdir}/${LLVM_DIR}/LLVMHello.so"
+FILES_${PN}-static-dev = "${libdir}/${LLVM_DIR}/*.a"
+FILES_SOLIBSDEV = ""
+INSANE_SKIP_${PN} = "dev-so"
+
+do_configure_prepend() {
+       # Remove RPATHs

meta-oe/recipes-core/llvm/llvm3.2_3.2.bb line 59

Quoted 10 lines
meta-oe/recipes-core/llvm/llvm3.2_3.2.bb new file +10 -0
+       sed -i 's:$(RPATH) -Wl,$(\(ToolDir\|LibDir\|ExmplDir\))::g' Makefile.rules
+
+       # Drop "svn" suffix from version string
+       sed -i 's/3\.2svn/3.2/g' configure
+
+       # Fix paths in llvm-config
+       sed -i "s|sys::path::parent_path(CurrentPath))|sys::path::parent_path(sys::path::parent_path(CurrentPath)))|g" tools/llvm-config/llvm-config.cpp
+       sed -i "s|/bin|/bin/${LLVM_DIR}|g" tools/llvm-config/llvm-config.cpp
+       sed -i "s|/include|/include/${LLVM_DIR}|g" tools/llvm-config/llvm-config.cpp
+       sed -i "s|/lib|/lib/${LLVM_DIR}|g" tools/llvm-config/llvm-config.cpp

The sed expressions will fail if applied more than once.

meta-oe/recipes-core/llvm/llvm3.2_3.2.bb line 68

Quoted 9 lines
meta-oe/recipes-core/llvm/llvm3.2_3.2.bb new file +9 -0
+
+       # Fails to build unless using separate directory from source
+       mkdir -p ${LLVM_BUILD_DIR}
+       cd ${LLVM_BUILD_DIR}
+}
+
+do_compile() {
+       cd ${LLVM_BUILD_DIR}
+       oe_runmake CC=${BUILD_CC} CXX=${BUILD_CXX} cross-compile-build-tools

It is missing overrides for AR, RANLIB, LD, NM, etc. ${STAGING_BINDIR_NATIVE} needs to be prepended to PATH for it to pick up native xml2-config.

Quoted 32 lines
meta-oe/recipes-core/llvm/llvm3.2_3.2.bb new file +29 -1
+       oe_runmake
+}
+
+do_install() {
+       cd ${LLVM_BUILD_DIR}
+       oe_runmake DESTDIR=${LLVM_INSTALL_DIR} install
+
+       mv ${LLVM_INSTALL_DIR}${bindir}/${HOST_SYS}-llvm-config-host ${LLVM_INSTALL_DIR}/llvm-config-host
+
+       install -d ${D}${bindir}/${LLVM_DIR}
+       mv ${LLVM_INSTALL_DIR}${bindir}/* ${D}${bindir}/${LLVM_DIR}/
+
+       install -d ${D}${includedir}/${LLVM_DIR}
+       mv ${LLVM_INSTALL_DIR}${includedir}/* ${D}${includedir}/${LLVM_DIR}/
+
+       install -d ${D}${libdir}/${LLVM_DIR}
+       mv ${LLVM_INSTALL_DIR}${libdir}/* ${D}${libdir}/${LLVM_DIR}/
+       ln -s ${LLVM_DIR}/libLLVM-${LLVM_RELEASE}.so ${D}${libdir}/libLLVM-${LLVM_RELEASE}.so
+
+       install -d ${D}${docdir}/${LLVM_DIR}
+       mv ${LLVM_INSTALL_DIR}${prefix}/docs/llvm/* ${D}${docdir}/${LLVM_DIR}
+}
+
+SYSROOT_PREPROCESS_FUNCS += "llvm_sysroot_preprocess"
+
+llvm_sysroot_preprocess() {
+       install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}
+       mv ${LLVM_INSTALL_DIR}/llvm-config-host ${SYSROOT_DESTDIR}${bindir_crossscripts}/llvm-config${LLVM_RELEASE}
+}
--

1.8.2.3