]> git.pld-linux.org Git - packages/hhvm.git/commitdiff
update disable-fastcgi.patch dev-3.12
authorElan Ruusamäe <glen@delfi.ee>
Mon, 27 Jun 2016 22:29:37 +0000 (01:29 +0300)
committerElan Ruusamäe <glen@delfi.ee>
Mon, 27 Jun 2016 22:29:37 +0000 (01:29 +0300)
disable-fastcgi.patch

index f00e9b567a1bc30fd4d6877ea631d3adb2b6d736..dfb3b080652aea15491d67a69aef0bb104368612 100644 (file)
@@ -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()
This page took 0.07482 seconds and 4 git commands to generate.