update system libs bconds

diff --git a/hhvm.spec b/hhvm.spec
index 250690485cb93a891efc3e8211780ddd1df21acc..c9d92df7e1198d1abd1d605d4768d92905460339 100644 (file)
--- a/hhvm.spec
+++ b/hhvm.spec
@@ -13,6 +13,7 @@
 # - system xhp
 # - system proxygen
 # - system thrift
+# - system LIBAFDT_LIBRARY
 
 # NOTES:
 # - hphp/runtime/base/runtime-option.cpp evalJitDefault enables jit if /.hhvm-jit exists (yes, in filesystem root)
@@ -310,13 +311,13 @@ fi
        -DUSE_JEMALLOC=OFF \
        -DUSE_TCMALLOC=OFF \
        -DTEST_BIN=OFF \
-       -DSYSTEM_PCRE=ON \
-       %{?with_system_sqlite:-DSYSTEM_SQLITE3=ON} \
-       %{?with_system_lz4:-DSYSTEM_LZ4=ON} \
-       %{?with_system_dconv:-DSYSTEM_DOUBLE_CONVERSION=ON} \
-       %{?with_system_fastlz:-DSYSTEM_FASTLZ=ON} \
+       -DPCRE_LIBRARY=OFF \
+       %{?with_system_sqlite:-DLIBSQLITE3_LIBRARY=OFF} \
+       %{?with_system_lz4:-DLZ4_LIBRARY=OFF} \
+       %{?with_system_dconv:-DDOUBLE_CONVERSION_LIBRARY=OFF} \
+       %{?with_system_fastlz:-DFASTLZ_LIBRARY=OFF} \
        %{?with_system_libafdt:-DSYSTEM_LIBAFDT=ON} \
-       %{?with_system_libzip:-DSYSTEM_LIBZIP=ON} \
+       %{?with_system_libzip:-DLIBZIP_LIBRARY=OFF} \
        -DENABLE_COTIRE=%{!?with_cotire:OFF}%{?with_cotire:ON} \
        .
 

diff --git a/system-thirdparty.patch b/system-thirdparty.patch
index 41fe3bac856957ef581ffdc8828ad6b2f42c566b..bbfee4a5801d8fb6fbba88a698eb2e227292cafe 100644 (file)
--- a/system-thirdparty.patch
+++ b/system-thirdparty.patch
@@ -1,49 +1,24 @@
---- hhvm-HHVM-3.3.1/third-party/CMakeLists.txt 2014-11-17 22:39:00.515744741 +0200
-+++ hhvm-HHVM-3.3.1/third-party/CMakeLists.txt 2014-11-18 19:55:23.702812657 +0200
-@@ -24,16 +24,39 @@
+upstream fix: https://github.com/hhvm/hhvm-third-party/pull/55
+
+--- hhvm-HHVM-3.3.3/third-party/CMakeLists.txt~        2015-01-09 23:57:55.000000000 +0200
++++ hhvm-HHVM-3.3.3/third-party/CMakeLists.txt 2015-02-05 19:11:24.761557999 +0200
+@@ -24,7 +24,6 @@
  set(THIRD_PARTY_HEADERS)
  
  list(APPEND THIRD_PARTY_MODULES
--  pcre
--  fastlz
 -  libafdt
    libmbfl
--  libsqlite3
    timelib
--  lz4
--  double-conversion
-   folly
--  libzip)
-+)
-+
-+if(NOT SYSTEM_PCRE)
-+  list(APPEND THIRD_PARTY_MODULES pcre)
-+endif()
-+
-+if(NOT SYSTEM_SQLITE3)
-+  list(APPEND THIRD_PARTY_MODULES libsqlite3)
-+endif()
-+
-+if(NOT SYSTEM_FASTLZ)
-+  list(APPEND THIRD_PARTY_MODULES fastlz)
-+endif()
-+
-+if(NOT SYSTEM_LIBAFDT)
+   folly)
+@@ -33,6 +32,11 @@
+   list(APPEND THIRD_PARTY_MODULES thrift)
+ endif()
+ 
++# Add bundled libafdt if the system one will not be used
++if(NOT LIBAFDT_LIBRARY)
 +  list(APPEND THIRD_PARTY_MODULES libafdt)
 +endif()
-+  
-+if(NOT SYSTEM_LZ4)
-+  list(APPEND THIRD_PARTY_MODULES lz4)
-+endif()
-+
-+if(NOT SYSTEM_DOUBLE_CONVERSION)
-+  list(APPEND THIRD_PARTY_MODULES double-conversion)
-+endif()
 +
-+if(NOT SYSTEM_LIBZIP)
-+  list(APPEND THIRD_PARTY_MODULES libzip)
-+endif()
-+
- if(ENABLE_FASTCGI)
-   list(APPEND THIRD_PARTY_MODULES proxygen)
-   list(APPEND THIRD_PARTY_MODULES thrift)
+ # Add bundled fastlz if the system one will not be used
+ if(NOT FASTLZ_LIBRARY)
+   list(APPEND THIRD_PARTY_MODULES fastlz)