[packages/hhvm] use system pcre

glen glen at pld-linux.org
Mon Nov 17 17:53:36 CET 2014


commit 142dde1992dc30bc3afd0a9d814fac29d884d8f2
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Mon Nov 17 18:53:25 2014 +0200

    use system pcre

 hhvm.spec               |  3 +++
 system-thirdparty.patch | 22 ++++++++++++++++++++++
 2 files changed, 25 insertions(+)
---
diff --git a/hhvm.spec b/hhvm.spec
index d24e2c9..04d5074 100644
--- a/hhvm.spec
+++ b/hhvm.spec
@@ -28,6 +28,7 @@ Source100:	get-source.sh
 Patch1:		no-debug.patch
 Patch2:		hphpize.patch
 Patch3:		MAX.patch
+Patch4:		system-thirdparty.patch
 URL:		https://github.com/facebook/hhvm/wiki
 BuildRequires:	ImageMagick-devel
 BuildRequires:	a52dec-libs-devel
@@ -228,6 +229,7 @@ mv folly-* third-party/folly/src
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 # prefer ones from system
 rm CMake/FindBISON.cmake
@@ -267,6 +269,7 @@ fi
 	-DUSE_JEMALLOC=OFF \
 	-DUSE_TCMALLOC=OFF \
 	-DHPHP_NOTEST=ON \
+	-DSYSTEM_PCRE=ON \
 	-DENABLE_COTIRE=ON \
 	.
 
diff --git a/system-thirdparty.patch b/system-thirdparty.patch
new file mode 100644
index 0000000..b113f8d
--- /dev/null
+++ b/system-thirdparty.patch
@@ -0,0 +1,22 @@
+--- hhvm-HHVM-3.3.1/./third-party/CMakeLists.txt~	2014-09-19 00:27:19.000000000 +0300
++++ hhvm-HHVM-3.3.1/./third-party/CMakeLists.txt	2014-11-17 16:47:31.381478001 +0200
+@@ -24,7 +24,6 @@
+ set(THIRD_PARTY_HEADERS)
+ 
+ list(APPEND THIRD_PARTY_MODULES
+-  pcre
+   fastlz
+   libafdt
+   libmbfl
+@@ -34,6 +33,11 @@
+   double-conversion
+   folly
+   libzip)
++
++if(NOT SYSTEM_PCRE)
++  list(APPEND THIRD_PARTY_MODULES pcre)
++endif()
++
+ if(ENABLE_FASTCGI)
+   list(APPEND THIRD_PARTY_MODULES proxygen)
+   list(APPEND THIRD_PARTY_MODULES thrift)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/hhvm.git/commitdiff/142dde1992dc30bc3afd0a9d814fac29d884d8f2



More information about the pld-cvs-commit mailing list