[packages/hiphop-php] out of source build is broken

glen glen at pld-linux.org
Sun Oct 6 02:03:34 CEST 2013


commit e883c14f73ae1af6cf085c1e2aeec0c44d00659e
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sun Oct 6 03:01:07 2013 +0300

    out of source build is broken

 hiphop-php.spec | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/hiphop-php.spec b/hiphop-php.spec
index 2a5f6e4..0185e4d 100644
--- a/hiphop-php.spec
+++ b/hiphop-php.spec
@@ -44,7 +44,7 @@ BuildRequires:	libdwarf-devel
 BuildRequires:	libicu-devel >= 4.2
 #BuildRequires:	libmbfl-devel
 BuildRequires:	libmcrypt-devel
-BuildRequires:	libmemcached-devel >= 1.0.9
+BuildRequires:	libmemcached-devel >= 1.0.4
 BuildRequires:	libstdc++-devel >= 6:4.3
 BuildRequires:	libunwind-devel
 BuildRequires:	libxml2-devel
@@ -116,8 +116,12 @@ export LIBEVENT_PREFIX=$HPHP_HOME/libevent
 	-DLibEvent_LIB_PATHS=$HPHP_HOME/libevent/.libs \
 %endif
 
+%if 0
+# out of dir build broken (can't find it's tools)
 install -d build
 cd build
+%endif
+
 CPPFLAGS="%{rpmcppflags} -fno-permissive"
 %cmake \
 	-DLIBEVENT_LIB=$HPHP_HOME/libevent/lib/libevent.so \
@@ -125,7 +129,7 @@ CPPFLAGS="%{rpmcppflags} -fno-permissive"
 	-DSKIP_BUNDLED_XHP=ON \
 	-DUSE_JEMALLOC=ON \
 	-DUSE_TCMALLOC=OFF \
-	../
+	./
 %{__make}
 
 %install
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/hiphop-php.git/commitdiff/1c7ec8177faf90a03f1eb6711cb53159cc0d0dc1



More information about the pld-cvs-commit mailing list