[packages/hhvm/dev-3.12: 4/4] update disable-fastcgi.patch

glen glen at pld-linux.org
Tue Jun 28 00:30:13 CEST 2016


commit aa0a559a8f8b20c8b1cd5f8c39def1b960e90070
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Tue Jun 28 01:29:37 2016 +0300

    update disable-fastcgi.patch

 disable-fastcgi.patch | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/disable-fastcgi.patch b/disable-fastcgi.patch
index f00e9b5..dfb3b08 100644
--- a/disable-fastcgi.patch
+++ b/disable-fastcgi.patch
@@ -1,10 +1,10 @@
-it's not possible to to build with -DENABLE_FASTCGI=1
+it's not possible to to build with -DENABLE_FASTCGI=0
 
 this commit adds it unconditionally ON for Linux:
 https://github.com/facebook/hhvm/commit/773a4cd620820d8424756f6f8def466d179e5f8e
 
---- hhvm-HHVM-3.9.1/CMake/HPHPSetup.cmake~	2015-10-05 10:35:55.000000000 +0300
-+++ hhvm-HHVM-3.9.1/CMake/HPHPSetup.cmake	2015-10-05 10:37:21.859232742 +0300
+--- hhvm-HHVM-3.12.2/CMake/HPHPSetup.cmake~	2016-06-28 00:54:10.000000000 +0300
++++ hhvm-HHVM-3.12.2/CMake/HPHPSetup.cmake	2016-06-28 00:55:38.257526606 +0300
 @@ -19,7 +19,9 @@
  endif()
  
@@ -16,7 +16,7 @@ https://github.com/facebook/hhvm/commit/773a4cd620820d8424756f6f8def466d179e5f8e
    set(HHVM_ANCHOR_SYMS
      -Wl,-u,_register_fastcgi_server
      -Wl,-segaddr,__text,0
-@@ -49,14 +49,20 @@
+@@ -48,14 +48,20 @@
    set(HHVM_ANCHOR_SYMS
      -Wl,--whole-archive ${HHVM_WHOLE_ARCHIVE_LIBRARIES} -Wl,--no-whole-archive)
  elseif(CYGWIN)
@@ -27,9 +27,9 @@ https://github.com/facebook/hhvm/commit/773a4cd620820d8424756f6f8def466d179e5f8e
    set(HHVM_ANCHOR_SYMS
    -Wl,--whole-archive ${HHVM_WHOLE_ARCHIVE_LIBRARIES} -Wl,--no-whole-archive)
  elseif (MSVC)
--  set(ENABLE_FASTCGI 0)
+-  set(ENABLE_FASTCGI 1)
 +  if(NOT DEFINED ENABLE_FASTCGI)
-+    set(ENABLE_FASTCGI 0)
++    set(ENABLE_FASTCGI 1)
 +  endif()
    set(HHVM_ANCHOR_SYMS ${HHVM_WHOLE_ARCHIVE_LIBRARIES})
  else()
@@ -38,5 +38,5 @@ https://github.com/facebook/hhvm/commit/773a4cd620820d8424756f6f8def466d179e5f8e
 +    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)
+ endif()
================================================================

---- gitweb:

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



More information about the pld-cvs-commit mailing list