packages: hiphop-php/hiphop-php.spec, hiphop-php/cmake-missing-library.diff...

glen glen at pld-linux.org
Sun May 16 15:09:15 CEST 2010 

Author: glen                         Date: Sun May 16 13:09:15 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- save work

---- Files affected:
packages/hiphop-php:
   hiphop-php.spec (1.4 -> 1.5) , cmake-missing-library.diff (NONE -> 1.1)  (NEW), cmake-missing-library.patch (NONE -> 1.1)  (NEW), gcc45.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/hiphop-php/hiphop-php.spec
diff -u packages/hiphop-php/hiphop-php.spec:1.4 packages/hiphop-php/hiphop-php.spec:1.5
--- packages/hiphop-php/hiphop-php.spec:1.4	Sun May 16 13:21:05 2010
+++ packages/hiphop-php/hiphop-php.spec	Sun May 16 15:09:09 2010
@@ -1,6 +1,13 @@
 # $Revision$, $Date$
 # TODO
-# - offline build (without git)
+# - 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
 Summary:	HipHop for PHP transforms PHP source code into highly optimized C++
 Name:		hiphop-php
 Version:	0.1
@@ -8,23 +15,26 @@
 License:	PHP 3.01
 Group:		Development/Languages
 # git clone git://github.com/facebook/hiphop-php.git
-# tar -cjf hiphop-php.tar.bz2 hiphop-php
+# 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
+Patch0:		cmake-missing-library.patch
+Patch1:		system-libmbfl.patch
+Patch2:		gcc45.patch
 URL:		http://wiki.github.com/facebook/hiphop-php/
 BuildRequires:	binutils-devel
-BuildRequires:	bison
+BuildRequires:	bison >= 2.3
 BuildRequires:	boost-devel >= 1.37
 BuildRequires:	cmake >= 2.6.4
 BuildRequires:	curl-devel >= 7.20.1-2
 BuildRequires:	expat-devel
-BuildRequires:	flex
+BuildRequires:	flex >= 2.5.35
 BuildRequires:	gd-devel
-BuildRequires:	git-core
 BuildRequires:	libcap-devel
 BuildRequires:	libevent-devel >= 1.4.13-2
 BuildRequires:	libicu-devel >= 4.2
-#BuildRequires:	libmbfl-devel
+BuildRequires:	libmbfl-devel
 BuildRequires:	libmcrypt
 BuildRequires:	libstdc++-devel >= 6:4.1
 BuildRequires:	libxml2-devel
@@ -54,28 +64,37 @@
 
 %prep
 %setup -qn %{name}
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+
+%{__sed} -i -e 's,/usr/local/bin/php,/usr/bin/php,g' src/crutch.php
 
 %build
 export HPHP_HOME=$(pwd)
 export HPHP_LIB=$HPHP_HOME/bin
 
-git submodule init
-git submodule update
-
-%cmake .
+%cmake . \
+	-DCMAKE_BUILD_TYPE=%{!?debug:Release}%{?debug:Debug} \
+	-DCMAKE_INSTALL_PREFIX=%{_prefix} \
+%if "%{_lib}" == "lib64"
+	-DLIB_SUFFIX=64
+%endif
 %{__make}
 
-%{__sed} -i -e 's,/usr/local/bin/php,/usr/bin/php,g' src/crutch.php
-
 %install
 rm -rf $RPM_BUILD_ROOT
-cd $RPM_BUILD_ROOT
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %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
@@ -83,6 +102,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2010/05/16 13:09:09  glen
+- save work
+
 Revision 1.4  2010/05/16 11:21:05  glen
 - md5
 

================================================================
Index: packages/hiphop-php/cmake-missing-library.diff
diff -u /dev/null packages/hiphop-php/cmake-missing-library.diff:1.1
--- /dev/null	Sun May 16 15:09:15 2010
+++ packages/hiphop-php/cmake-missing-library.diff	Sun May 16 15:09:09 2010
@@ -0,0 +1,13 @@
+diff --git a/CMake/HPHPFindLibs.cmake b/CMake/HPHPFindLibs.cmake
+index 52f0b7a..9127139 100644
+--- a/CMake/HPHPFindLibs.cmake
++++ b/CMake/HPHPFindLibs.cmake
+@@ -203,4 +203,8 @@ macro(hphp_link target)
+ 	target_link_libraries(${target} ${ONIG_LIB})
+ 	target_link_libraries(${target} ${Mcrypt_LIB})
+ 	target_link_libraries(${target} ${GD_LIBRARY})
++
++	target_link_libraries(${target} crypt)
++	target_link_libraries(${target} rt)
++	target_link_libraries(${target} resolv)
+ endmacro()

================================================================
Index: packages/hiphop-php/cmake-missing-library.patch
diff -u /dev/null packages/hiphop-php/cmake-missing-library.patch:1.1
--- /dev/null	Sun May 16 15:09:15 2010
+++ packages/hiphop-php/cmake-missing-library.patch	Sun May 16 15:09:09 2010
@@ -0,0 +1,10 @@
+--- 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)
+ 	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()

================================================================
Index: packages/hiphop-php/gcc45.patch
diff -u /dev/null packages/hiphop-php/gcc45.patch:1.1
--- /dev/null	Sun May 16 15:09:15 2010
+++ packages/hiphop-php/gcc45.patch	Sun May 16 15:09:09 2010
@@ -0,0 +1,38 @@
+--- hiphop-php/src/cpp/ext/ext_class.cpp~	2010-05-16 15:37:59.000000000 +0300
++++ hiphop-php/src/cpp/ext/ext_class.cpp	2010-05-16 15:38:01.043525285 +0300
+@@ -41,13 +41,13 @@
+ }
+ 
+ bool f_class_exists(CStrRef class_name, bool autoload /* = false */) {
+-  const ClassInfo::ClassInfo *info =
++  const ClassInfo *info =
+     ClassInfo::FindClass(class_name.data());
+   return info && info->isDeclared();
+ }
+ 
+ bool f_interface_exists(CStrRef interface_name, bool autoload /* = false */) {
+-  const ClassInfo::ClassInfo *info =
++  const ClassInfo *info =
+     ClassInfo::FindInterface(interface_name.data());
+   return info && info->isDeclared();
+ }
+--- hiphop-php/src/cpp/ext/ext_misc.cpp~	2010-05-16 15:39:59.000000000 +0300
++++ hiphop-php/src/cpp/ext/ext_misc.cpp	2010-05-16 15:40:03.153302857 +0300
+@@ -76,7 +76,7 @@
+       }
+     }
+     if (f_class_exists(className)) { // taking care of volatile class
+-      const ClassInfo::ClassInfo *info;
++      const ClassInfo *info;
+       for (const char *parentClass = className.data(); parentClass;
+            parentClass = info->getParentClass()) {
+         info = ClassInfo::FindClass(parentClass);
+@@ -134,7 +134,7 @@
+       }
+     }
+     if (f_class_exists(className)) { // taking care of volatile class
+-      const ClassInfo::ClassInfo *info;
++      const ClassInfo *info;
+       for (const char *parentClass = className.data();
+            parentClass && *parentClass;
+            parentClass = info->getParentClass()) {
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/hiphop-php/hiphop-php.spec?r1=1.4&r2=1.5&f=u

More information about the pld-cvs-commit mailing list