- up to 9f026c9 snapshot

Changed files:
    cmake-missing-library.patch -> 1.2
    gcc45.patch -> 1.2
    hiphop-php.spec -> 1.6
    system-libafdt.patch -> 1.2
    system-libmbfl.patch -> 1.2

diff --git a/cmake-missing-library.patch b/cmake-missing-library.patch
index 58f2d46c546576c9dad896c848daedd1862d65f8..220aba938ec3ff66f976ef59ed5e31e1a1e6a9e3 100644 (file)
--- a/cmake-missing-library.patch
+++ b/cmake-missing-library.patch
@@ -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})

diff --git a/gcc45.patch b/gcc45.patch
deleted file mode 100644 (file)
index 703935b..0000000
--- a/gcc45.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- 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()) {

diff --git a/hiphop-php.spec b/hiphop-php.spec
index b28d31ac490bda560efe9f0905d748692210cdfd..ca073ff5c85fc7f4f90e166bcb81678e721617d3 100644 (file)
--- a/hiphop-php.spec
+++ b/hiphop-php.spec
@@ -1,47 +1,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}
@@ -58,27 +77,45 @@ Facebook sees about a 50% reduction in CPU usage when serving equal
 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
@@ -91,6 +128,3 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%{_includedir}/afdt.h
-%{_libdir}/libafdt.a
-%{_libdir}/libxhp.a

diff --git a/system-libafdt.patch b/system-libafdt.patch
index ebbf0977b870a79506456408ba666c20b2969b65..674b8e5d53f2338c6c53ea2377a428e50c500747 100644 (file)
--- a/system-libafdt.patch
+++ b/system-libafdt.patch
@@ -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)

diff --git a/system-libmbfl.patch b/system-libmbfl.patch
index bff5448ed5e1d73acd2c5a59a6cc3a5436e64f1e..061c2e02f2ad1f81719435a3e13a86c76e701904 100644 (file)
--- a/system-libmbfl.patch
+++ b/system-libmbfl.patch
@@ -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$")