[packages/hhvm] - include folly module; - update provide module list php(bz2), php(fileinfo), php(icu_num_fmt), php(
glen
glen at pld-linux.org
Thu Jan 2 18:21:46 CET 2014
commit 991b30170d1dd0db1132810d18a2318bfa6f9cb8
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Thu Jan 2 17:19:09 2014 +0000
- include folly module;
- update provide module list php(bz2), php(fileinfo), php(icu_num_fmt), php(zip)
- drop outdated boost-system-category.patch
boost-system-category.patch | 22 ----------------------
hhvm.spec | 24 +++++++++++++++---------
2 files changed, 15 insertions(+), 31 deletions(-)
---
diff --git a/hhvm.spec b/hhvm.spec
index c66cc03..f15ddb2 100644
--- a/hhvm.spec
+++ b/hhvm.spec
@@ -7,7 +7,7 @@
Summary: Virtual Machine, Runtime, and JIT for PHP
Name: hhvm
Version: 2.3.2
-Release: 0.1
+Release: 0.2
License: PHP 3.01
Group: Development/Languages
Source0: https://github.com/facebook/hhvm/archive/HHVM-%{version}.tar.gz
@@ -15,18 +15,18 @@ Source0: https://github.com/facebook/hhvm/archive/HHVM-%{version}.tar.gz
# 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
-Source2: get-source.sh
+Source2: https://github.com/facebook/folly/archive/4d6d659/folly-%{version}-4d6d659.tar.gz
+Source100: get-source.sh
Patch0: cmake-missing-library.patch
Patch1: libevent14.patch
Patch3: system-xhp.patch
Patch4: system-libafdt.patch
Patch5: system-folly.patch
-Patch6: boost-system-category.patch
URL: http://wiki.github.com/facebook/hiphop-php/
BuildRequires: binutils-devel
BuildRequires: bison >= 2.3
BuildRequires: boost-devel >= 1.50
-BuildRequires: cmake >= 2.8.5
+BuildRequires: cmake >= 2.8.7
BuildRequires: curl-devel >= 7.29.0
BuildRequires: elfutils-devel
BuildRequires: expat-devel
@@ -35,7 +35,7 @@ BuildRequires: gcc >= 6:4.6.0
BuildRequires: gd-devel
BuildRequires: glog-devel >= 0.3.2
BuildRequires: imap-devel >= 1:2007
-#BuildRequires: jemalloc-devel
+#BuildRequires: jemalloc-devel >= 3.0.0
BuildRequires: libafdt-devel >= 0.1.0
BuildRequires: libcap-devel
BuildRequires: libdwarf-devel
@@ -59,17 +59,20 @@ BuildRequires: tbb-devel >= 4.0.6000
BuildRequires: zlib-devel
Provides: php(apc)
Provides: php(bcmath)
+Provides: php(bz2)
Provides: php(ctype)
Provides: php(curl)
Provides: php(date)
Provides: php(dom)
Provides: php(exif)
Provides: php(fb)
+Provides: php(fileinfo)
Provides: php(filter)
Provides: php(gd)
Provides: php(hash)
Provides: php(hotprofiler)
Provides: php(iconv)
+Provides: php(icu_num_fmt)
Provides: php(icu_ucsdet)
Provides: php(icu_uspoof)
Provides: php(idn)
@@ -107,8 +110,9 @@ Provides: php(xhprof)
Provides: php(xml)
Provides: php(xmlreader)
Provides: php(xmlwriter)
+Provides: php(zip)
Provides: php(zlib)
-Obsoletes: hiphop-php < 2.3.2
+Obsoletes: hiphop-php < 2.3.2-0.2
ExclusiveArch: %{x8664}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -128,10 +132,11 @@ with a FastCGI-based webserver, and work is in progress to make HHVM
work smoothly with Apache.
%prep
-%setup -q -a1 -n %{name}-HHVM-%{version}
+%setup -q -a1 -a2 -n %{name}-HHVM-%{version}
+
+mv folly-*/* hphp/submodules/folly
#%patch5 -p1
-%patch6 -p1
ln -s libevent-1.4.*-stable libevent
%{__patch} -d libevent -p1 < hphp/third_party/libevent-1.4.14.fb-changes.diff
@@ -166,6 +171,7 @@ fi
export HPHP_HOME=$(pwd)
export HPHP_LIB=$HPHP_HOME/bin
+install -d $HPHP_LIB
# asm linking breaks on $CC containing spaces
if [[ "%{__cc}" = *ccache* ]]; then
@@ -202,7 +208,7 @@ cd build
# setup COMPILER_ID/HHVM_REPO_SCHEMA so it doesn't look it up from our package git repo
# see hphp/util/generate-buildinfo.sh
-export COMPILER_ID=HPHP-%{version}-%{release}-%{githash}}
+export COMPILER_ID=HPHP-%{version}-%{release}-%{githash}
export HHVM_REPO_SCHEMA=$(date +%N_%s)
%{__make}
diff --git a/boost-system-category.patch b/boost-system-category.patch
deleted file mode 100644
index fc5d5c1..0000000
--- a/boost-system-category.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-workaround for symbol error boost::system::system_category
-
-/usr/bin/ccache x86_64-pld-linux-g++ -fno-gcse -fno-omit-frame-pointer -ftemplate-depth-120 -Wall -Woverloaded-virtual -Wno-deprecated -Wno-strict-aliasing -Wno-write-strings -Wno-invalid-offsetof -fno-operator-names -Wno-error=array-bounds -Wno-error=switch -std=gnu++0x -Werror=format-security -Wno-unused-result -Wno-sign-compare -O2 -fwrapv -pipe -Wformat -Werror=format-security -gdwarf-4 -fno-debug-types-section -fvar-tracking-assignments -g2 -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector --param=ssp-buffer-size=4 -fPIC -march=x86-64 -gdwarf-4 -fno-debug-types-section -fvar-tracking-assignments -g2 -DNDEBUG -Wl,--as-needed -Wl,--no-copy-dt-needed-entries -Wl,-z,relro -Wl,-z,combreloc CMakeFiles/gen-class-map.dir/gen-class-map.cpp.o CMakeFiles/gen-class-map.dir/idl.cpp.o -o gen-class-map -rdynamic -lfolly -lglog ../../../../bin/libdouble-conversion.a -lpthread -ldl
-/usr/bin/ld: CMakeFiles/gen-class-map.dir/gen-class-map.cpp.o: undefined reference to symbol 'boost::system::system_category()'
-/usr/lib64/libboost_system.so.1.54.0: error adding symbols: DSO missing from command line
-collect2: error: ld returned 1 exit status
-make[2]: *** [hphp/tools/bootstrap/gen-class-map] Error 1
-make[2]: Leaving directory `/home/users/glen/rpm/BUILD/x86_64-linux/hiphop-php-HPHP-2.1.0/build'
-
---- hiphop-php-HPHP-2.1.0/hphp/tools/bootstrap/CMakeLists.txt 2013-10-06 01:35:42.071737427 +0300
-+++ hiphop-php-HPHP-2.1.0/hphp/tools/bootstrap/CMakeLists.txt 2013-10-06 01:47:36.638238285 +0300
-@@ -2,7 +2,7 @@
--target_link_libraries(gen-ext-hhvm folly ${LIBGLOG_LIBRARY} double-conversion ${LIBPTHREAD_LIBRARIES} ${DL_LIB})
-+target_link_libraries(gen-ext-hhvm folly ${LIBGLOG_LIBRARY} double-conversion ${LIBPTHREAD_LIBRARIES} -lboost_system ${DL_LIB})
-
- add_executable(gen-infotabs "gen-infotabs.cpp" "idl.cpp")
--target_link_libraries(gen-infotabs folly ${LIBGLOG_LIBRARY} double-conversion ${LIBPTHREAD_LIBRARIES} ${DL_LIB})
-+target_link_libraries(gen-infotabs folly ${LIBGLOG_LIBRARY} double-conversion ${LIBPTHREAD_LIBRARIES} -lboost_system ${DL_LIB})
-
- add_executable(gen-class-map "gen-class-map.cpp" "idl.cpp")
--target_link_libraries(gen-class-map folly ${LIBGLOG_LIBRARY} double-conversion ${LIBPTHREAD_LIBRARIES} ${DL_LIB})
-+target_link_libraries(gen-class-map folly ${LIBGLOG_LIBRARY} double-conversion ${LIBPTHREAD_LIBRARIES} -lboost_system ${DL_LIB})
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/hhvm.git/commitdiff/991b30170d1dd0db1132810d18a2318bfa6f9cb8
More information about the pld-cvs-commit
mailing list