[packages/hhvm] disable test building

glen glen at pld-linux.org
Tue Jan 7 16:59:05 CET 2014


commit dc7e02edc7996bc6696fe66c26ff333aeaf20f33
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Fri Jan 3 16:41:19 2014 +0200

    disable test building

 hhvm.spec    |  5 ++++-
 notest.patch | 18 ++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)
---
diff --git a/hhvm.spec b/hhvm.spec
index 32254cc..4bfed92 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.19
+Release:	0.21
 License:	PHP 3.01
 Group:		Development/Languages
 Source0:	https://github.com/facebook/hhvm/archive/HHVM-%{version}.tar.gz
@@ -28,6 +28,7 @@ Patch5:		system-folly.patch
 Patch6:		checksum.patch
 Patch7:		imap-gss.patch
 Patch8:		hphpize.patch
+Patch9:		notest.patch
 URL:		http://wiki.github.com/facebook/hiphop-php/
 BuildRequires:	apr-devel
 BuildRequires:	autoconf
@@ -190,6 +191,7 @@ sed -i -e '21 d' hphp/third_party/folly/folly/detail/Malloc.h
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 #%patch5 -p1
 
 # prefer ones from system
@@ -253,6 +255,7 @@ cd build
 	-DCMAKE_PREFIX_PATH=%{_prefix} \
 	-DUSE_JEMALLOC=OFF \
 	-DUSE_TCMALLOC=OFF \
+	-DHPHP_NOTEST=ON \
 	./
 
 # setup COMPILER_ID/HHVM_REPO_SCHEMA so it doesn't look it up from our package git repo
diff --git a/notest.patch b/notest.patch
new file mode 100644
index 0000000..ad671b8
--- /dev/null
+++ b/notest.patch
@@ -0,0 +1,18 @@
+env NOTEST does not seem to work, still seeing 
+
+  Linking CXX executable test
+
+in the output.
+
+and linking 800mb executable, with embedding systemlibs to it, while no tests are performed, is making packaging really slow.
+--- hhvm-HHVM-2.3.2/hphp/CMakeLists.txt~	2013-12-23 20:51:42.000000000 +0000
++++ hhvm-HHVM-2.3.2/hphp/CMakeLists.txt	2014-01-03 08:35:29.988356817 +0000
+@@ -52,7 +52,7 @@
+ 
+ add_subdirectory(hhvm)
+ 
+-if (NOT "$ENV{HPHP_NOTEST}" STREQUAL "1")
++if (NOT HPHP_NOTEST)
+ 	add_subdirectory(test)
+ endif ()
+ 
================================================================

---- gitweb:

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



More information about the pld-cvs-commit mailing list