commit ff711f1f077636aa68a3f96140e08c1dc0c919ce Author: Elan Ruusamäe <g...@delfi.ee> Date: Wed Jan 8 00:40:00 2014 +0200
build without debug debug got enabled due pld way of overriding build type hhvm.spec | 4 +++- no-debug.patch | 17 +++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) --- diff --git a/hhvm.spec b/hhvm.spec index 93953e6..4f700b5 100644 --- a/hhvm.spec +++ b/hhvm.spec @@ -7,7 +7,7 @@ Summary: Virtual Machine, Runtime, and JIT for PHP Name: hhvm Version: 2.3.2 -Release: 0.22 +Release: 0.24 License: PHP 3.01 Group: Development/Languages Source0: https://github.com/facebook/hhvm/archive/HHVM-%{version}.tar.gz @@ -29,6 +29,7 @@ Patch6: checksum.patch Patch7: imap-gss.patch Patch8: hphpize.patch Patch9: notest.patch +Patch10: no-debug.patch URL: http://wiki.github.com/facebook/hiphop-php/ BuildRequires: apr-devel BuildRequires: autoconf @@ -190,6 +191,7 @@ mv folly-*/* hphp/submodules/folly %patch7 -p1 %patch8 -p1 %patch9 -p1 +%patch10 -p1 #%patch5 -p1 # prefer ones from system diff --git a/no-debug.patch b/no-debug.patch new file mode 100644 index 0000000..3527fff --- /dev/null +++ b/no-debug.patch @@ -0,0 +1,17 @@ +as pld sets CMAKE_BUILD_TYPE to PLD, conditions like this fail: + +if (${CMAKE_BUILD_TYPE} MATCHES "Release") + +mabe PLDRelease would do better? + +--- hhvm/CMake/HPHPSetup.cmake~ 2014-01-07 22:15:26.600836165 +0200 ++++ hhvm/CMake/HPHPSetup.cmake 2014-01-07 22:46:26.036361039 +0200 +@@ -69,7 +69,7 @@ + add_definitions(-D_GNU_SOURCE) + endif() + +-if(${CMAKE_BUILD_TYPE} MATCHES "Release") ++if(NOT ${CMAKE_BUILD_TYPE} MATCHES "Debug") + add_definitions(-DRELEASE=1) + add_definitions(-DNDEBUG) + message("Generating Release build") ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/hhvm.git/commitdiff/df52bbfc4e40d177c6a939c689fce71793aea9d2 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit