aboutsummaryrefslogtreecommitdiff
path: root/meta-linaro/recipes-extra
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <marcin.juszkiewicz@linaro.org>2013-03-27 22:59:36 +0100
committerMarcin Juszkiewicz <marcin.juszkiewicz@linaro.org>2013-03-27 22:59:36 +0100
commit193dd2c80f664ea9cd983f9d3529f7f12b72692b (patch)
treef7098acf6b5486e28b6504c0be6b77f05b6dc2e6 /meta-linaro/recipes-extra
parent4ff1ac6fe3f8868525ca93b6d4048014855ca224 (diff)
downloadmeta-linaro-193dd2c80f664ea9cd983f9d3529f7f12b72692b.tar.gz
hiphopvm: search for dwarf.h in /usr/include/libdwarf first
Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Diffstat (limited to 'meta-linaro/recipes-extra')
-rw-r--r--meta-linaro/recipes-extra/hiphopvm/files/hrw-check-for-libdwarf-in-our-place-first.patch32
-rw-r--r--meta-linaro/recipes-extra/hiphopvm/hiphopvm_git.bb5
2 files changed, 36 insertions, 1 deletions
diff --git a/meta-linaro/recipes-extra/hiphopvm/files/hrw-check-for-libdwarf-in-our-place-first.patch b/meta-linaro/recipes-extra/hiphopvm/files/hrw-check-for-libdwarf-in-our-place-first.patch
new file mode 100644
index 00000000..bcc83521
--- /dev/null
+++ b/meta-linaro/recipes-extra/hiphopvm/files/hrw-check-for-libdwarf-in-our-place-first.patch
@@ -0,0 +1,32 @@
+From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
+
+We have two files named dwarf.h:
+- /usr/include/dwarf.h from elfutils
+- /usr/include/libdwarf/dwarf.h from libdwarf
+
+HHVM checks for dwarf.h and assumes that libdwarf.h is in same directory which
+is wrong for OE and probably also in RedHat based systems (Debian handles it in
+other way).
+
+Upstream-Status: pending
+
+---
+ CMake/FindLibDwarf.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- git.orig/CMake/FindLibDwarf.cmake
++++ git/CMake/FindLibDwarf.cmake
+@@ -18,12 +18,12 @@ endif (LIBDWARF_LIBRARIES AND LIBDWARF_I
+
+ find_path (DWARF_INCLUDE_DIR
+ NAMES
+ dwarf.h
+ PATHS
+- /usr/include
+ /usr/include/libdwarf
++ /usr/include
+ /usr/local/include
+ /opt/local/include
+ /sw/include
+ ENV CPATH) # PATH and INCLUDE will also work
+
diff --git a/meta-linaro/recipes-extra/hiphopvm/hiphopvm_git.bb b/meta-linaro/recipes-extra/hiphopvm/hiphopvm_git.bb
index 9c08b61b..cc50204b 100644
--- a/meta-linaro/recipes-extra/hiphopvm/hiphopvm_git.bb
+++ b/meta-linaro/recipes-extra/hiphopvm/hiphopvm_git.bb
@@ -44,7 +44,10 @@ LIC_FILES_CHKSUM = " \
file://LICENSE.ZEND;md5=69e7a9c51846dd6692f1b946f95f6c60"
SRC_URI = "git://github.com/facebook/hiphop-php.git \
- file://disable-not-available-for-aarch64.patch"
+ file://hrw-check-for-libdwarf-in-our-place-first.patch"
+
+# disable libunwind for aarch64
+SRC_URI_aarch64 += "file://disable-not-available-for-aarch64.patch"
SRCREV = "${AUTOREV}"