[packages/hhvm] add HHVM_EXTENSION_DIR cmake define to override extension install dir at ext build time
glen
glen at pld-linux.org
Wed Aug 27 19:49:00 CEST 2014
commit e66c75f613c9267be3bbfb724bc04ebf5f47c862
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Wed Aug 27 19:23:39 2014 +0300
add HHVM_EXTENSION_DIR cmake define to override extension install dir at ext build time
hhvm.spec | 2 ++
hphpize.patch | 15 +++++++++++++++
2 files changed, 17 insertions(+)
---
diff --git a/hhvm.spec b/hhvm.spec
index be8942c..a8dd8ab 100644
--- a/hhvm.spec
+++ b/hhvm.spec
@@ -25,6 +25,7 @@ Source6: php.ini
Source100: get-source.sh
Patch0: ccache.patch
Patch1: no-debug.patch
+Patch2: hphpize.patch
URL: https://github.com/facebook/hhvm/wiki
BuildRequires: ImageMagick-devel
BuildRequires: a52dec-libs-devel
@@ -220,6 +221,7 @@ mv folly-* third-party/folly/src
%patch0 -p1
%patch1 -p1
+%patch2 -p1
# prefer ones from system
rm CMake/FindBISON.cmake
diff --git a/hphpize.patch b/hphpize.patch
new file mode 100644
index 0000000..25c4923
--- /dev/null
+++ b/hphpize.patch
@@ -0,0 +1,15 @@
+--- hhvm-HHVM-3.2.0/CMake/HPHPIZEFunctions.cmake 2014-07-18 03:12:10.000000000 +0300
++++ hhvm-HHVM-3.2.0/CMake/HPHPIZEFunctions.cmake 2014-08-27 17:07:59.461056148 +0300
+@@ -17,7 +17,11 @@
+ add_library(${EXTNAME} SHARED ${ARGN})
+ set_target_properties(${EXTNAME} PROPERTIES PREFIX "")
+ set_target_properties(${EXTNAME} PROPERTIES SUFFIX ".so")
+- install(TARGETS ${EXTNAME} DESTINATION "lib/hphp/extensions/${HHVM_API_VERSION}")
++ if(HHVM_EXTENSION_DIR)
++ install(TARGETS ${EXTNAME} DESTINATION ${HHVM_EXTENSION_DIR})
++ else()
++ install(TARGETS ${EXTNAME} DESTINATION "lib/hphp/extensions/${HHVM_API_VERSION}")
++ endif()
+ endfunction()
+
+ # Add an extension that uses the Zend compatibility layer.
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/hhvm.git/commitdiff/e66c75f613c9267be3bbfb724bc04ebf5f47c862
More information about the pld-cvs-commit
mailing list