[packages/hhvm/dev-3.6: 10/20] add jemalloc bcond

glen glen at pld-linux.org
Tue Apr 7 10:21:08 CEST 2015


commit 65afc524f760f27b8d1788a0e60837414d1743e0
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Mon Apr 6 14:49:05 2015 +0300

    add jemalloc bcond

 hhvm.spec | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/hhvm.spec b/hhvm.spec
index de65c48..37c5d8a 100644
--- a/hhvm.spec
+++ b/hhvm.spec
@@ -8,6 +8,7 @@
 %bcond_without	system_libzip	# system libzip
 %bcond_with	fastcgi		# enable FastCGI protocol
 %bcond_without	async_mysql		# enable async MySQL
+%bcond_with	jemalloc		# enable jemalloc
 # cotire breaks sqlite3 on builders: https://github.com/facebook/hhvm/issues/4524
 %bcond_with	cotire			# cotire (compile time reducer): Speed up the build by precompiling headers
 
@@ -89,7 +90,7 @@ BuildRequires:	gcc >= 6:4.6.0
 BuildRequires:	gd-devel
 BuildRequires:	glog-devel >= 0.3.2
 BuildRequires:	imap-devel >= 1:2007
-#BuildRequires:	jemalloc-devel >= 3.0.0
+%{?with_jemalloc:BuildRequires:	jemalloc-devel >= 3.0.0}
 %{?with_system_libafdt:BuildRequires:	libafdt-devel >= 0.1.0}
 BuildRequires:	libcap-devel
 BuildRequires:	libdwarf-devel >= 20130729
@@ -332,7 +333,7 @@ fi
 	-DCMAKE_PREFIX_PATH=%{_prefix} \
 	-DHHVM_DYNAMIC_EXTENSION_DIR=%{hhvm_extensiondir} \
 	-DMYSQL_UNIX_SOCK_ADDR=/var/lib/mysql/mysql.sock \
-	-DUSE_JEMALLOC=OFF \
+	-DUSE_JEMALLOC=%{!?with_jemalloc:OFF}%{?with_jemalloc:ON} \
 	-DUSE_TCMALLOC=OFF \
 	-DTEST_BIN=OFF \
 	-DENABLE_FASTCGI=%{!?with_fastcgi:OFF}%{?with_fastcgi:ON} \
================================================================

---- gitweb:

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



More information about the pld-cvs-commit mailing list