diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2013-04-25 17:53:47 +0200 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2013-04-25 17:53:47 +0200 |
| commit | c1e8aa6f0e756e27cde4438aeb78964a45c230e0 (patch) | |
| tree | ae68e320f2e5085a2cd05cb083a729250d676f07 /meta-linaro/recipes-extra/hiphopvm | |
| parent | 1cd63ba8e6aafde76b217960619625e38a3da61f (diff) | |
hiphop: use libunwind
Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Diffstat (limited to 'meta-linaro/recipes-extra/hiphopvm')
| -rw-r--r-- | meta-linaro/recipes-extra/hiphopvm/files/disable-not-available-for-aarch64.patch | 21 | ||||
| -rw-r--r-- | meta-linaro/recipes-extra/hiphopvm/hiphopvm_git.bb | 6 |
2 files changed, 2 insertions, 25 deletions
diff --git a/meta-linaro/recipes-extra/hiphopvm/files/disable-not-available-for-aarch64.patch b/meta-linaro/recipes-extra/hiphopvm/files/disable-not-available-for-aarch64.patch deleted file mode 100644 index 3fde2f86..00000000 --- a/meta-linaro/recipes-extra/hiphopvm/files/disable-not-available-for-aarch64.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- - CMake/HPHPFindLibs.cmake | 22 +++++++++++----------- - 1 file changed, 11 insertions(+), 11 deletions(-) - ---- git.orig/CMake/HPHPFindLibs.cmake -+++ git/CMake/HPHPFindLibs.cmake -@@ -43,12 +43,12 @@ find_package(Libinotify) - if (LIBINOTIFY_INCLUDE_DIR) - include_directories(${LIBINOTIFY_INCLUDE_DIR}) - endif() - - # unwind checks --find_package(Libunwind REQUIRED) --include_directories(${LIBUNWIND_INCLUDE_DIR}) -+# find_package(Libunwind REQUIRED) -+# include_directories(${LIBUNWIND_INCLUDE_DIR}) - - # iconv checks - find_package(Libiconv REQUIRED) - include_directories(${LIBICONV_INCLUDE_DIR}) - if (LIBICONV_CONST) diff --git a/meta-linaro/recipes-extra/hiphopvm/hiphopvm_git.bb b/meta-linaro/recipes-extra/hiphopvm/hiphopvm_git.bb index 6671e585..d4301cef 100644 --- a/meta-linaro/recipes-extra/hiphopvm/hiphopvm_git.bb +++ b/meta-linaro/recipes-extra/hiphopvm/hiphopvm_git.bb @@ -16,6 +16,7 @@ libdwarf \ libevent-fb \ libmcrypt \ libmemcached \ +libunwind \ libxml2 \ mysql5 \ ncurses \ @@ -31,7 +32,7 @@ ${EXTRA_DEPENDS} \ " # optional (for now) dependencies: -EXTRA_DEPENDS = "libunwind gperftools" +EXTRA_DEPENDS = "gperftools" EXTRA_DEPENDS_aarch64 = "" # 64-bit platforms only @@ -47,9 +48,6 @@ SRC_URI = "git://github.com/facebook/hiphop-php.git \ file://hrw-check-for-libdwarf-in-our-place-first.patch \ " -# disable libunwind for aarch64 -SRC_URI_append_aarch64 = "file://disable-not-available-for-aarch64.patch" - SRCREV = "${AUTOREV}" S = "${WORKDIR}/git" |