diff options
| author | Elan Ruusamäe | 2015-04-06 08:42:19 (GMT) |
|---|---|---|
| committer | Elan Ruusamäe | 2015-04-06 08:42:19 (GMT) |
| commit | a0edfcd3997cffafa6b0348d575f52215b32a9f2 (patch) | |
| tree | c656d109b511733e64368e7b24c3a205c2f599a9 | |
| parent | b45da1911d1e458054d08437bd9a0574ee1db6ee (diff) | |
| download | hhvm-a0edfcd3997cffafa6b0348d575f52215b32a9f2.zip hhvm-a0edfcd3997cffafa6b0348d575f52215b32a9f2.tar.gz | |
make disable-fastcgi actually work
| -rw-r--r-- | disable-fastcgi.patch | 36 | ||||
| -rw-r--r-- | hhvm.spec | 2 |
2 files changed, 38 insertions, 0 deletions
diff --git a/disable-fastcgi.patch b/disable-fastcgi.patch new file mode 100644 index 0000000..9f660a9 --- /dev/null +++ b/disable-fastcgi.patch @@ -0,0 +1,36 @@ +it's not possible to to build with -DENABLE_FASTCGI=1 + +this commit adds it unconditionally ON for Linux: +https://github.com/facebook/hhvm/commit/773a4cd620820d8424756f6f8def466d179e5f8e + +--- hhvm-HHVM-3.6.1/CMake/HPHPSetup.cmake~ 2015-03-24 02:00:12.000000000 +0200 ++++ hhvm-HHVM-3.6.1/CMake/HPHPSetup.cmake 2015-04-06 09:50:54.551300775 +0300 +@@ -19,7 +19,9 @@ + endif() + + if (APPLE) +- set(ENABLE_FASTCGI 1) ++ if(NOT DEFINED ENABLE_FASTCGI) ++ set(ENABLE_FASTCGI 1) ++ endif() + set(HHVM_ANCHOR_SYMS + -Wl,-u,_register_fastcgi_server + -Wl,-segaddr,__text,0 +@@ -28,11 +30,15 @@ + set(HHVM_ANCHOR_SYMS + -Wl,--whole-archive ${HHVM_WHOLE_ARCHIVE_LIBRARIES} -Wl,--no-whole-archive) + elseif(CYGWIN) +- set(ENABLE_FASTCGI 0) ++ if(NOT DEFINED ENABLE_FASTCGI) ++ set(ENABLE_FASTCGI 0) ++ endif() + set(HHVM_ANCHOR_SYMS + -Wl,--whole-archive ${HHVM_WHOLE_ARCHIVE_LIBRARIES} -Wl,--no-whole-archive) + else() +- set(ENABLE_FASTCGI 1) ++ if(NOT DEFINED ENABLE_FASTCGI) ++ set(ENABLE_FASTCGI 1) ++ endif() + set(HHVM_ANCHOR_SYMS + -Wl,-uregister_libevent_server,-uregister_fastcgi_server + -Wl,--whole-archive ${HHVM_WHOLE_ARCHIVE_LIBRARIES} -Wl,--no-whole-archive) @@ -69,6 +69,7 @@ Source100: get-source.sh Patch2: hphpize.patch Patch5: cmake.patch Patch6: webscalesql-5.6-build.patch +Patch7: disable-fastcgi.patch URL: https://github.com/facebook/hhvm/wiki BuildRequires: ImageMagick-devel BuildRequires: a52dec-libs-devel @@ -282,6 +283,7 @@ mv mcrouter-* third-party/mcrouter/src %patch2 -p1 #%patch5 -p1 %patch6 -p1 -d third-party/webscalesqlclient/webscalesql-5.6 +%patch7 -p1 # prefer ones from system rm CMake/FindBISON.cmake |