[packages/hhvm/dev-3.6: 9/20] make disable-fastcgi actually work

[glen]

commit a0edfcd3997cffafa6b0348d575f52215b32a9f2
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Mon Apr 6 11:42:19 2015 +0300

    make disable-fastcgi actually work

 disable-fastcgi.patch | 36 ++++++++++++++++++++++++++++++++++++
 hhvm.spec             |  2 ++
 2 files changed, 38 insertions(+)
---
diff --git a/hhvm.spec b/hhvm.spec
index 414d897..de65c48 100644
--- a/hhvm.spec
+++ b/hhvm.spec
@@ -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
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)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/hhvm.git/commitdiff/29a3971a9677d3f2f66508505458f8da4876b5e2