packages: hiphop-php/cmake-missing-library.patch, hiphop-php/hiphop-php.spe...

glen glen at pld-linux.org
Mon Jul 25 20:44:21 CEST 2011 

Author: glen                         Date: Mon Jul 25 18:44:21 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 9f026c9 snapshot

---- Files affected:
packages/hiphop-php:
   cmake-missing-library.patch (1.1 -> 1.2) , hiphop-php.spec (1.5 -> 1.6) , system-libafdt.patch (1.1 -> 1.2) , system-libmbfl.patch (1.1 -> 1.2) , gcc45.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/hiphop-php/cmake-missing-library.patch
diff -u packages/hiphop-php/cmake-missing-library.patch:1.1 packages/hiphop-php/cmake-missing-library.patch:1.2
--- packages/hiphop-php/cmake-missing-library.patch:1.1	Sun May 16 15:09:09 2010
+++ packages/hiphop-php/cmake-missing-library.patch	Mon Jul 25 20:44:15 2011
@@ -1,10 +1,12 @@
---- hiphop-php/CMake/HPHPFindLibs.cmake~	2010-05-16 00:08:26.000000000 +0300
-+++ hiphop-php/CMake/HPHPFindLibs.cmake	2010-05-16 15:54:09.769893945 +0300
-@@ -209,4 +209,7 @@
- 	target_link_libraries(${target} xhp)
+--- hiphop-php/CMake/HPHPFindLibs.cmake~	2011-07-25 19:22:01.000000000 +0300
++++ hiphop-php/CMake/HPHPFindLibs.cmake	2011-07-25 19:40:07.515376789 +0300
+@@ -389,6 +389,9 @@
+ 
  	target_link_libraries(${target} afdt)
  	target_link_libraries(${target} mbfl)
 +	target_link_libraries(${target} crypt)
 +	target_link_libraries(${target} rt)
 +	target_link_libraries(${target} resolv)
- endmacro()
+ 
+ 	target_link_libraries(${target} ${READLINE_LIBRARY})
+ 	target_link_libraries(${target} ${NCURSES_LIBRARY})

================================================================
Index: packages/hiphop-php/hiphop-php.spec
diff -u packages/hiphop-php/hiphop-php.spec:1.5 packages/hiphop-php/hiphop-php.spec:1.6
--- packages/hiphop-php/hiphop-php.spec:1.5	Sun May 16 15:09:09 2010
+++ packages/hiphop-php/hiphop-php.spec	Mon Jul 25 20:44:15 2011
@@ -2,47 +2,66 @@
 # TODO
 # - system libmbfl, system xhp, sqlite3
 # - there should be a bit more packaged into files
-# - build fail:
-#Linking CXX executable hphp
-#Building hphpi
-#Exception: ParseError: [<string>:1] Unable to parse line hphpi_build.hdf
-#make[2]: *** [src/hphp/hphp] Error 255
-#make[1]: *** [src/hphp/CMakeFiles/hphp.dir/all] Error 2
+# - mysql namespace sanity:
+#/home/users/glen/rpm/BUILD.x86_64-linux/hiphop-php/src/runtime/ext/ext_mysql.cpp:730: error: undefined reference to 'cli_safe_read'
+#/home/users/glen/rpm/BUILD.x86_64-linux/hiphop-php/src/runtime/ext/ext_mysql.cpp:740: error: undefined reference to 'net_field_length'
+#/home/users/glen/rpm/BUILD.x86_64-linux/hiphop-php/src/runtime/ext/ext_mysql.cpp:753: error: undefined reference to 'cli_safe_read'
+#/home/users/glen/rpm/BUILD.x86_64-linux/hiphop-php/src/runtime/ext/ext_mysql.cpp:784: error: undefined reference to 'free_root'
+%if 0
+# source updating:
+git clone git://github.com/facebook/hiphop-php.git
+cd hiphop-php
+git submodule init
+git submodule update
+rm -rf src/third_party/libmbfl
+rm -rf src/third_party/xhp
+rm -rf src/third_party/libafdt
+version=$((echo 'function HPHP_VERSION(v) { printf("%.3f", v)}; BEGIN{'; cat src/version; echo '}') | awk -f -)
+version=${version}_$(git log -1 --format=%h)
+cd ..
+tar --exclude-vcs -cjf hiphop-php-$version.tar.bz2 hiphop-php
+../dropin hiphop-php-$version.tar.bz2
+%endif
 Summary:	HipHop for PHP transforms PHP source code into highly optimized C++
 Name:		hiphop-php
-Version:	0.1
+Version:	1.000
 Release:	0.1
 License:	PHP 3.01
 Group:		Development/Languages
-# git clone git://github.com/facebook/hiphop-php.git
-# rm -rf hiphop-php/src/third_party/libmbfl
-# tar --exclude-vcs -cjf hiphop-php.tar.bz2 hiphop-php
-Source0:	%{name}.tar.bz2
-# Source0-md5:	fbeaba0785d6ae3a6f513576867fb5a6
+Source0:	%{name}-%{version}_9f026c9.tar.bz2
+# Source0-md5:	16b7928995a91001657b015fe7f8a06d
+# need fb.changes.patch, which is available for 1.4 only
+Source1:	http://www.monkey.org/~provos/libevent-1.4.14b-stable.tar.gz
+# Source1-md5:	a00e037e4d3f9e4fe9893e8a2d27918c
 Patch0:		cmake-missing-library.patch
-Patch1:		system-libmbfl.patch
-Patch2:		gcc45.patch
+Patch3:		system-xhp.patch
+Patch4:		system-libafdt.patch
 URL:		http://wiki.github.com/facebook/hiphop-php/
 BuildRequires:	binutils-devel
 BuildRequires:	bison >= 2.3
-BuildRequires:	boost-devel >= 1.37
+BuildRequires:	boost-devel >= 1.39
 BuildRequires:	cmake >= 2.6.4
 BuildRequires:	curl-devel >= 7.20.1-2
 BuildRequires:	expat-devel
 BuildRequires:	flex >= 2.5.35
 BuildRequires:	gd-devel
+BuildRequires:	libafdt-devel >= 0.1.0
 BuildRequires:	libcap-devel
-BuildRequires:	libevent-devel >= 1.4.13-2
+#BuildRequires:	libevent-devel < 2.0
+#BuildRequires:	libevent-devel >= 1.4.13-2
 BuildRequires:	libicu-devel >= 4.2
 BuildRequires:	libmbfl-devel
 BuildRequires:	libmcrypt
-BuildRequires:	libstdc++-devel >= 6:4.1
+BuildRequires:	libmemcached-devel >= 0.39
+BuildRequires:	libstdc++-devel >= 6:4.3
 BuildRequires:	libxml2-devel
 BuildRequires:	mysql-devel
 BuildRequires:	oniguruma-devel
 BuildRequires:	openssl-devel
 BuildRequires:	pcre-devel
+BuildRequires:	php-xhp-devel >= 1.3.9-6
 BuildRequires:	re2c >= 0.13.0
+BuildRequires:	rpmbuild(macros) >= 1.600
 BuildRequires:	tbb-devel >= 2.2
 BuildRequires:	zlib-devel
 ExclusiveArch:	%{x8664}
@@ -59,27 +78,45 @@
 amounts of Web traffic when compared to Apache and PHP. Facebook's API
 tier can serve twice the traffic using 30% less CPU.
 
-Keep up to date on HipHop development by joining the HipHop for PHP
-Discussion Group.
-
 %prep
-%setup -qn %{name}
+%setup -qn %{name} -a1
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
+#%patch3 -p1
+%patch4 -p1
+
+ln -s libevent-1.4.*-stable libevent
+%{__patch} -d libevent -p1 < src/third_party/libevent-1.4.14.fb-changes.diff
 
-%{__sed} -i -e 's,/usr/local/bin/php,/usr/bin/php,g' src/crutch.php
+rm -rf src/third_party/libmbfl
+rm -rf src/third_party/xhp
+rm -rf src/third_party/libafdt
 
 %build
+# build libevent 1.4 with fb patches
+if [ ! -d libevent/.libs ]; then
+	cd libevent
+	# TODO: should use static linking, but then it fails to detect libraries due missing -lrt
+	%configure \
+		%{?0:--enable-static} \
+		%{?0:--disable-shared}
+	%{__make}
+	ln -s .libs lib
+	ln -s . include
+	cd ..
+fi
+
 export HPHP_HOME=$(pwd)
 export HPHP_LIB=$HPHP_HOME/bin
 
-%cmake . \
-	-DCMAKE_BUILD_TYPE=%{!?debug:Release}%{?debug:Debug} \
-	-DCMAKE_INSTALL_PREFIX=%{_prefix} \
-%if "%{_lib}" == "lib64"
-	-DLIB_SUFFIX=64
-%endif
+install -d build
+cd build
+%cmake \
+	-DLibEvent_PREFIX=$HPHP_HOME/libevent \
+	-DzLIBEVENT_INCLUDE_DIR=$HPHP_HOME/libevent \
+	-DzLIBEVENT_LIB=$HPHP_HOME/libevent/.libs/libevent.a \
+	-DCMAKE_PREFIX_PATH=%{_prefix} \
+	-DSKIP_BUNDLED_XHP=ON \
+	../
 %{__make}
 
 %install
@@ -92,9 +129,6 @@
 
 %files
 %defattr(644,root,root,755)
-%{_includedir}/afdt.h
-%{_libdir}/libafdt.a
-%{_libdir}/libxhp.a
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -102,6 +136,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2011/07/25 18:44:15  glen
+- up to 9f026c9 snapshot
+
 Revision 1.5  2010/05/16 13:09:09  glen
 - save work
 

================================================================
Index: packages/hiphop-php/system-libafdt.patch
diff -u packages/hiphop-php/system-libafdt.patch:1.1 packages/hiphop-php/system-libafdt.patch:1.2
--- packages/hiphop-php/system-libafdt.patch:1.1	Mon Jul 25 18:44:31 2011
+++ packages/hiphop-php/system-libafdt.patch	Mon Jul 25 20:44:15 2011
@@ -1,11 +1,20 @@
---- hiphop-php/src/CMakeLists.txt~	2010-05-16 16:46:42.000000000 +0300
-+++ hiphop-php/src/CMakeLists.txt	2010-05-16 16:47:02.396715257 +0300
-@@ -87,8 +87,6 @@
- auto_sources(TIMELIB_SOURCES "*.c" "RECURSE" "${CMAKE_CURRENT_SOURCE_DIR}/third_party/timelib")
- add_library(timelib STATIC ${TIMELIB_SOURCES})
+--- hiphop-php/CMake/HPHPFindLibs.cmake~	2011-07-25 19:48:08.000000000 +0300
++++ hiphop-php/CMake/HPHPFindLibs.cmake	2011-07-25 19:48:41.840861431 +0300
+@@ -102,7 +102,6 @@
+ # SQLite3 + timelib are bundled in HPHP sources
+ include_directories("${HPHP_HOME}/src/third_party/libsqlite3")
+ include_directories("${HPHP_HOME}/src/third_party/timelib")
+-include_directories("${HPHP_HOME}/src/third_party/libafdt/src")
+ include_directories("${HPHP_HOME}/src/third_party/libmbfl")
+ include_directories("${HPHP_HOME}/src/third_party/libmbfl/mbfl")
+ include_directories("${HPHP_HOME}/src/third_party/libmbfl/filter")
+--- hiphop-php/src/CMakeLists.txt~	2011-07-25 19:22:02.000000000 +0300
++++ hiphop-php/src/CMakeLists.txt	2011-07-25 20:21:34.195874236 +0300
+@@ -88,7 +88,6 @@
+ 	add_subdirectory(third_party/xhp/xhp)
+ endif()
  
 -add_subdirectory(third_party/libafdt)
--
- foreach (CXX_FILE ${CXX_SOURCES})
- 	if(${CXX_FILE} MATCHES ".no.cpp$")
- 		SET_SOURCE_FILES_PROPERTIES(
+ add_subdirectory(third_party/libmbfl)
+ add_subdirectory(third_party/libsqlite3)
+ add_subdirectory(third_party/timelib)

================================================================
Index: packages/hiphop-php/system-libmbfl.patch
diff -u packages/hiphop-php/system-libmbfl.patch:1.1 packages/hiphop-php/system-libmbfl.patch:1.2
--- packages/hiphop-php/system-libmbfl.patch:1.1	Sun May 16 15:09:33 2010
+++ packages/hiphop-php/system-libmbfl.patch	Mon Jul 25 20:44:15 2011
@@ -1,22 +1,10 @@
---- hiphop-php/CMakeLists.txt~	2010-05-16 00:08:26.000000000 +0300
-+++ hiphop-php/CMakeLists.txt	2010-05-16 14:22:40.731255486 +0300
-@@ -18,9 +18,5 @@
- include("${HPHP_HOME}/CMake/HPHPFunctions.cmake")
- include(CheckFunctionExists)
+--- hiphop-php/src/CMakeLists.txt~	2011-07-25 20:21:34.000000000 +0300
++++ hiphop-php/src/CMakeLists.txt	2011-07-25 20:22:10.107423133 +0300
+@@ -88,7 +88,6 @@
+ 	add_subdirectory(third_party/xhp/xhp)
+ endif()
  
--IF(NOT EXISTS "src/third_party/libmbfl/mbfl/mbfilter.h")
--	message(FATAL_ERROR "Please setup the git submodule to pull dependencies")
--ENDIF()
--
- add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/src)
- 
---- hiphop-php/src/CMakeLists.txt~	2010-05-16 00:08:27.000000000 +0300
-+++ hiphop-php/src/CMakeLists.txt	2010-05-16 14:23:25.480428003 +0300
-@@ -89,7 +89,6 @@
- 
- add_subdirectory(third_party/xhp/xhp)
- add_subdirectory(third_party/libafdt)
 -add_subdirectory(third_party/libmbfl)
+ add_subdirectory(third_party/libsqlite3)
+ add_subdirectory(third_party/timelib)
  
- foreach (CXX_FILE ${CXX_SOURCES})
- 	if(${CXX_FILE} MATCHES ".no.cpp$")
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/hiphop-php/cmake-missing-library.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/hiphop-php/hiphop-php.spec?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/hiphop-php/system-libafdt.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/hiphop-php/system-libmbfl.patch?r1=1.1&r2=1.2&f=u

More information about the pld-cvs-commit mailing list