]> git.pld-linux.org Git - packages/hhvm.git/commitdiff
use system pcre
authorElan Ruusamäe <glen@delfi.ee>
Mon, 17 Nov 2014 16:53:25 +0000 (18:53 +0200)
committerElan Ruusamäe <glen@delfi.ee>
Mon, 17 Nov 2014 16:53:25 +0000 (18:53 +0200)
hhvm.spec
system-thirdparty.patch [new file with mode: 0644]

index d24e2c9ccffb0ba769c80a950007d5f4b532b1a4..04d50740fb2a87d2f91777fa4053991095731cfe 100644 (file)
--- 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 (file)
index 0000000..b113f8d
--- /dev/null
@@ -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)
This page took 0.064771 seconds and 4 git commands to generate.