add HHVM_EXTENSION_DIR cmake define to override extension install dir at ext build...

diff --git a/hhvm.spec b/hhvm.spec
index be8942c814825f2c542904fc4ce85385c6ff456e..a8dd8ab5ff1040b7d1d67d64531bd013d0c2c062 100644 (file)
--- 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 (file)
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.