Date: Tuesday, January 27, 2015 @ 16:17:32 Author: mtorromeo Revision: 126650
archrelease: copy trunk to community-x86_64 Added: hhvm/repos/community-x86_64/PKGBUILD (from rev 126649, hhvm/trunk/PKGBUILD) hhvm/repos/community-x86_64/hhvm.install (from rev 126649, hhvm/trunk/hhvm.install) hhvm/repos/community-x86_64/hhvm.service (from rev 126649, hhvm/trunk/hhvm.service) hhvm/repos/community-x86_64/hhvm.tmpfile (from rev 126649, hhvm/trunk/hhvm.tmpfile) hhvm/repos/community-x86_64/hhvm@.service (from rev 126649, hhvm/trunk/hhvm@.service) hhvm/repos/community-x86_64/php.ini (from rev 126649, hhvm/trunk/php.ini) hhvm/repos/community-x86_64/server.ini (from rev 126649, hhvm/trunk/server.ini) Deleted: hhvm/repos/community-x86_64/PKGBUILD hhvm/repos/community-x86_64/hhvm-max.patch hhvm/repos/community-x86_64/hhvm.install hhvm/repos/community-x86_64/hhvm.service hhvm/repos/community-x86_64/hhvm.tmpfile hhvm/repos/community-x86_64/hhvm@.service hhvm/repos/community-x86_64/php.ini hhvm/repos/community-x86_64/server.ini ----------------+ PKGBUILD | 219 ++++++++++++++++++++++++++----------------------------- hhvm-max.patch | 30 ------- hhvm.install | 18 ++-- hhvm.service | 30 +++---- hhvm.tmpfile | 4 - hhvm@.service | 30 +++---- php.ini | 20 ++--- server.ini | 12 +-- 8 files changed, 163 insertions(+), 200 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2015-01-27 15:10:21 UTC (rev 126649) +++ PKGBUILD 2015-01-27 15:17:32 UTC (rev 126650) @@ -1,113 +0,0 @@ -# $Id$ -# Maintainer: Massimiliano Torromeo <massimiliano.torro...@gmail.com> -# Contributor: James Miller <ja...@pocketrent.com> - -pkgname=hhvm -pkgver=3.5.0 -_thirdparty_commit=d0cad57b5427f84af8f77d60b8b53de4aaea4694 -_folly_commit=6f9b619d9ffc219296a818a83266d60628e6aedd -_thrift_commit=bba5d4590ff71e8f34ce4f90a8d7b2cf867ca3d0 -_proxygen_commit=8a602aa40383d6dddbdcb2a951067b9923edfc74 -pkgrel=1 -pkgdesc="Virtual Machine, Runtime, and JIT for PHP" -arch=('x86_64') -url="http://hhvm.com" -license=('PHP') -depends=('boost-libs' 'google-glog' 'libmysqlclient' 'libmemcached' 'libzip' 'lz4' - 'libxslt' 'intel-tbb' 'libmcrypt' 'oniguruma' 'jemalloc' 'curl' 'libvpx' - 'libdwarf' 'imagemagick' 'libedit' 'sqlite' 'libyaml') -makedepends=('git' 'cmake' 'gcc' 'chrpath' 'boost' 'gflags' 'python2' 'pfff') -source=("https://github.com/facebook/hhvm/archive/HHVM-$pkgver.tar.gz" - "hhvm-third-party-$_thirdparty_commit.tar.gz::https://github.com/hhvm/hhvm-third-party/archive/$_thirdparty_commit.tar.gz" - "folly-$_folly_commit.tar.gz::https://github.com/facebook/folly/archive/$_folly_commit.tar.gz" - "thrift-$_thrift_commit.tar.gz::https://github.com/facebook/fbthrift/archive/$_thrift_commit.tar.gz" - "proxygen-$_proxygen_commit.tar.gz::https://github.com/facebook/proxygen/archive/$_proxygen_commit.tar.gz" - 'hhvm-max.patch' - 'hhvm.tmpfile' - 'hhvm.service' - 'hhvm@.service' - 'php.ini' - 'server.ini') -install=hhvm.install -backup=(etc/hhvm/{php,server}.ini) -options+=('!buildflags') - -prepare() { - cd "$srcdir"/$pkgname-HHVM-$pkgver - patch -p1 -i "$srcdir"/hhvm-max.patch - - rm -rf third-party - ln -s "$srcdir"/hhvm-third-party-$_thirdparty_commit third-party - - # no bundled pcre - sed '/pcre/d' -i third-party/CMakeLists.txt - - cd third-party/folly - rm -rf src - ln -s "$srcdir"/folly-$_folly_commit src - - cd ../thrift - rm -rf src - ln -s "$srcdir"/fbthrift-$_thrift_commit src - - cd ../proxygen - rm -rf src - ln -s "$srcdir"/proxygen-$_proxygen_commit src -} - -build() { - cd "$srcdir"/$pkgname-HHVM-$pkgver - msg2 "Building hhvm" - - # comment for tests - HPHP_NOTEST=1 \ - cmake \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_PREFIX_PATH="$srcdir" \ - -DFREETYPE_INCLUDE_DIRS:PATH=/usr/include/freetype2 \ - . - - make - - for hacktool in hackificator remove_soft_types; do - cd "$srcdir"/$pkgname-HHVM-$pkgver/hphp/hack/tools/$hacktool - make depend - make - done -} - -# check() { -# cd "$srcdir"/$pkgname-HHVM-$pkgver/hphp/test -# ./run --threads 8 quick -# } - -package() { - cd "$srcdir"/$pkgname-HHVM-$pkgver - make DESTDIR="$pkgdir/" install - mv "$pkgdir"/usr/lib{64,} - - cd hphp/hack/bin - for bin in hh_* tools/*; do - install -Dm755 $bin "$pkgdir"/usr/bin/$(basename $bin) - done - - cd "$srcdir" - install -Dm644 hhvm.tmpfile "$pkgdir"/usr/lib/tmpfiles.d/hhvm.conf - install -Dm644 hhvm.service "$pkgdir"/usr/lib/systemd/system/hhvm.service - install -Dm644 hhvm@.service "$pkgdir"/usr/lib/systemd/system/hhvm@.service - - install -Dm644 php.ini "$pkgdir"/etc/hhvm/php.ini - install -Dm644 server.ini "$pkgdir"/etc/hhvm/server.ini -} - -sha256sums=('1ddf74f84f45bbccf9bd37da7ea4e3048122e09fbeba46ae0ad3982d321012ba' - 'c62bc664fd96de44aedc07e2cf136b7ff712001f53d41b003c260c50c8ec9e8e' - '00922bf8128f368fa8b3a1b0ab6d79086a77a9f95484bf020d0f06bcd4710441' - 'b5338bb0299651ccffef826348a50618c92980e619dbc9eb34f16c9ff4a6765a' - '34fbb931fe112dca460f765d2552241914dcc229de72918c81af9787c3276d56' - 'ab98d74c382f503f1208407e891d26a88f9314fa2b631f6ec2a4a73ead644ba2' - 'c356010a6d6b976f387bb205a75ea07d5f40593a8010483f2ed0f66f112331bc' - '8b50d1ef9f5f726e6d8d469a8c84d85ad63f8b507b97d258b4d751a0e3e221df' - '59c640602929dac0aa34d06c668ed69361eb4b7b47a77f9aa0badb4d0b61571c' - '3e3093f817706c238fad021483f114fd4ce0b45d84097dcb7870157fc9ec769f' - '5b53bc57965e1c5151d720dc7f63f1b2e8ebd5e758b2ef0be3b74df38ebcbce0') Copied: hhvm/repos/community-x86_64/PKGBUILD (from rev 126649, hhvm/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2015-01-27 15:17:32 UTC (rev 126650) @@ -0,0 +1,106 @@ +# $Id$ +# Maintainer: Massimiliano Torromeo <massimiliano.torro...@gmail.com> +# Contributor: James Miller <ja...@pocketrent.com> + +pkgname=hhvm +pkgver=3.5.0 +_thirdparty_commit=d0cad57b5427f84af8f77d60b8b53de4aaea4694 +_folly_commit=6f9b619d9ffc219296a818a83266d60628e6aedd +_thrift_commit=bba5d4590ff71e8f34ce4f90a8d7b2cf867ca3d0 +_proxygen_commit=8a602aa40383d6dddbdcb2a951067b9923edfc74 +pkgrel=2 +pkgdesc="Virtual Machine, Runtime, and JIT for PHP" +arch=('x86_64') +url="http://hhvm.com" +license=('PHP') +depends=('boost-libs' 'google-glog' 'libmysqlclient' 'libmemcached' 'libzip' + 'libxslt' 'intel-tbb' 'libmcrypt' 'oniguruma' 'jemalloc' 'curl' 'libvpx' + 'libdwarf' 'imagemagick' 'libedit' 'sqlite' 'libyaml' 'fribidi') +makedepends=('git' 'cmake' 'gcc' 'boost' 'gflags' 'python2' 'pfff' 'mongodb') +source=("https://github.com/facebook/hhvm/archive/HHVM-$pkgver.tar.gz" + "hhvm-third-party-$_thirdparty_commit.tar.gz::https://github.com/hhvm/hhvm-third-party/archive/$_thirdparty_commit.tar.gz" + "folly-$_folly_commit.tar.gz::https://github.com/facebook/folly/archive/$_folly_commit.tar.gz" + "thrift-$_thrift_commit.tar.gz::https://github.com/facebook/fbthrift/archive/$_thrift_commit.tar.gz" + "proxygen-$_proxygen_commit.tar.gz::https://github.com/facebook/proxygen/archive/$_proxygen_commit.tar.gz" + 'hhvm.tmpfile' + 'hhvm.service' + 'hhvm@.service' + 'php.ini' + 'server.ini') +install=hhvm.install +backup=(etc/hhvm/{php,server}.ini) +options+=('!buildflags') + +prepare() { + cd "$srcdir"/$pkgname-HHVM-$pkgver + + rm -rf third-party + ln -s "$srcdir"/hhvm-third-party-$_thirdparty_commit third-party + + cd third-party/folly + rm -rf src + ln -s "$srcdir"/folly-$_folly_commit src + + cd ../thrift + rm -rf src + ln -s "$srcdir"/fbthrift-$_thrift_commit src + + cd ../proxygen + rm -rf src + ln -s "$srcdir"/proxygen-$_proxygen_commit src +} + +build() { + cd "$srcdir"/$pkgname-HHVM-$pkgver + msg2 "Building hhvm" + + cmake -Wno-dev \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_PREFIX_PATH="$srcdir" \ + -DENABLE_MONGO:BOOL=ON \ + . + + make + + for hacktool in hackificator remove_soft_types; do + cd "$srcdir"/$pkgname-HHVM-$pkgver/hphp/hack/tools/$hacktool + make depend + make + done +} + +# check() { +# cd "$srcdir"/$pkgname-HHVM-$pkgver/hphp/test +# ./run --threads 8 quick +# } + +package() { + cd "$srcdir"/$pkgname-HHVM-$pkgver + make DESTDIR="$pkgdir/" install + mv "$pkgdir"/usr/lib{64,} + + cd hphp/hack/bin + for bin in hh_* tools/*; do + install -Dm755 $bin "$pkgdir"/usr/bin/$(basename $bin) + done + + cd "$srcdir" + install -Dm644 hhvm.tmpfile "$pkgdir"/usr/lib/tmpfiles.d/hhvm.conf + install -Dm644 hhvm.service "$pkgdir"/usr/lib/systemd/system/hhvm.service + install -Dm644 hhvm@.service "$pkgdir"/usr/lib/systemd/system/hhvm@.service + + install -Dm644 php.ini "$pkgdir"/etc/hhvm/php.ini + install -Dm644 server.ini "$pkgdir"/etc/hhvm/server.ini +} + +sha256sums=('1ddf74f84f45bbccf9bd37da7ea4e3048122e09fbeba46ae0ad3982d321012ba' + 'c62bc664fd96de44aedc07e2cf136b7ff712001f53d41b003c260c50c8ec9e8e' + '00922bf8128f368fa8b3a1b0ab6d79086a77a9f95484bf020d0f06bcd4710441' + 'b5338bb0299651ccffef826348a50618c92980e619dbc9eb34f16c9ff4a6765a' + '34fbb931fe112dca460f765d2552241914dcc229de72918c81af9787c3276d56' + 'c356010a6d6b976f387bb205a75ea07d5f40593a8010483f2ed0f66f112331bc' + '8b50d1ef9f5f726e6d8d469a8c84d85ad63f8b507b97d258b4d751a0e3e221df' + '59c640602929dac0aa34d06c668ed69361eb4b7b47a77f9aa0badb4d0b61571c' + '3e3093f817706c238fad021483f114fd4ce0b45d84097dcb7870157fc9ec769f' + '5b53bc57965e1c5151d720dc7f63f1b2e8ebd5e758b2ef0be3b74df38ebcbce0') Deleted: hhvm-max.patch =================================================================== --- hhvm-max.patch 2015-01-27 15:10:21 UTC (rev 126649) +++ hhvm-max.patch 2015-01-27 15:17:32 UTC (rev 126650) @@ -1,30 +0,0 @@ -diff --git a/hphp/compiler/analysis/emitter.cpp b/hphp/compiler/analysis/emitter.cpp -index ba33bbd..38fe9ed 100644 ---- a/hphp/compiler/analysis/emitter.cpp -+++ b/hphp/compiler/analysis/emitter.cpp -@@ -124,6 +124,10 @@ namespace HPHP { - namespace Compiler { - /////////////////////////////////////////////////////////////////////////////// - -+#ifndef MAX -+#define MAX(a,b) ((a)<(b)?(b):(a)) -+#endif -+ - TRACE_SET_MOD(emitter) - - using uchar = unsigned char; -diff --git a/hphp/runtime/base/zend-pack.cpp b/hphp/runtime/base/zend-pack.cpp -index d878ea4..01034c2 100644 ---- a/hphp/runtime/base/zend-pack.cpp -+++ b/hphp/runtime/base/zend-pack.cpp -@@ -23,6 +23,10 @@ - - namespace HPHP { - -+#ifndef MAX -+#define MAX(a,b) ((a)<(b)?(b):(a)) -+#endif -+ - #define INC_OUTPUTPOS(a,b) \ - if ((a) < 0 || ((INT_MAX - outputpos)/((int)b)) < (a)) { \ - throw_invalid_argument \ Deleted: hhvm.install =================================================================== --- hhvm.install 2015-01-27 15:10:21 UTC (rev 126649) +++ hhvm.install 2015-01-27 15:17:32 UTC (rev 126650) @@ -1,9 +0,0 @@ -post_install() { - if [[ ! -d run/hhvm ]]; then - usr/bin/systemd-tmpfiles --create hhvm.conf - fi -} - -post_upgrade() { - post_install -} Copied: hhvm/repos/community-x86_64/hhvm.install (from rev 126649, hhvm/trunk/hhvm.install) =================================================================== --- hhvm.install (rev 0) +++ hhvm.install 2015-01-27 15:17:32 UTC (rev 126650) @@ -0,0 +1,9 @@ +post_install() { + if [[ ! -d run/hhvm ]]; then + usr/bin/systemd-tmpfiles --create hhvm.conf + fi +} + +post_upgrade() { + post_install +} Deleted: hhvm.service =================================================================== --- hhvm.service 2015-01-27 15:10:21 UTC (rev 126649) +++ hhvm.service 2015-01-27 15:17:32 UTC (rev 126650) @@ -1,15 +0,0 @@ -[Unit] -Description=HHVM FastCGI application server -After=syslog.target network.target - -[Service] -PIDFile=/run/hhvm/server.pid -PrivateTmp=true -User=http -Group=http -ExecStart=/usr/bin/hhvm --config=/etc/hhvm/php.ini --config=/etc/hhvm/server.ini --mode=daemon -vServer.Type=fastcgi -vPidFile=/run/hhvm/server.pid -Restart=on-failure -RuntimeDirectory=hhvm - -[Install] -WantedBy=multi-user.target Copied: hhvm/repos/community-x86_64/hhvm.service (from rev 126649, hhvm/trunk/hhvm.service) =================================================================== --- hhvm.service (rev 0) +++ hhvm.service 2015-01-27 15:17:32 UTC (rev 126650) @@ -0,0 +1,15 @@ +[Unit] +Description=HHVM FastCGI application server +After=syslog.target network.target + +[Service] +PIDFile=/run/hhvm/server.pid +PrivateTmp=true +User=http +Group=http +ExecStart=/usr/bin/hhvm --config=/etc/hhvm/php.ini --config=/etc/hhvm/server.ini --mode=daemon -vServer.Type=fastcgi -vPidFile=/run/hhvm/server.pid +Restart=on-failure +RuntimeDirectory=hhvm + +[Install] +WantedBy=multi-user.target Deleted: hhvm.tmpfile =================================================================== --- hhvm.tmpfile 2015-01-27 15:10:21 UTC (rev 126649) +++ hhvm.tmpfile 2015-01-27 15:17:32 UTC (rev 126650) @@ -1,2 +0,0 @@ -d /var/run/hhvm 755 http http -d /var/log/hhvm 755 http http Copied: hhvm/repos/community-x86_64/hhvm.tmpfile (from rev 126649, hhvm/trunk/hhvm.tmpfile) =================================================================== --- hhvm.tmpfile (rev 0) +++ hhvm.tmpfile 2015-01-27 15:17:32 UTC (rev 126650) @@ -0,0 +1,2 @@ +d /var/run/hhvm 755 http http +d /var/log/hhvm 755 http http Deleted: hhvm@.service =================================================================== --- hhvm@.service 2015-01-27 15:10:21 UTC (rev 126649) +++ hhvm@.service 2015-01-27 15:17:32 UTC (rev 126650) @@ -1,15 +0,0 @@ -[Unit] -Description=HHVM FastCGI application server -After=syslog.target network.target - -[Service] -PIDFile=/run/hhvm/%I.pid -PrivateTmp=true -User=http -Group=http -ExecStart=/usr/bin/hhvm --config=/etc/hhvm/php.ini --config=/etc/hhvm/%I.ini --mode=daemon -vServer.Type=fastcgi -vPidFile=/run/hhvm/%I.pid -Restart=on-failure -RuntimeDirectory=hhvm - -[Install] -WantedBy=multi-user.target Copied: hhvm/repos/community-x86_64/hhvm@.service (from rev 126649, hhvm/trunk/hhvm@.service) =================================================================== --- hhvm@.service (rev 0) +++ hhvm@.service 2015-01-27 15:17:32 UTC (rev 126650) @@ -0,0 +1,15 @@ +[Unit] +Description=HHVM FastCGI application server +After=syslog.target network.target + +[Service] +PIDFile=/run/hhvm/%I.pid +PrivateTmp=true +User=http +Group=http +ExecStart=/usr/bin/hhvm --config=/etc/hhvm/php.ini --config=/etc/hhvm/%I.ini --mode=daemon -vServer.Type=fastcgi -vPidFile=/run/hhvm/%I.pid +Restart=on-failure +RuntimeDirectory=hhvm + +[Install] +WantedBy=multi-user.target Deleted: php.ini =================================================================== --- php.ini 2015-01-27 15:10:21 UTC (rev 126649) +++ php.ini 2015-01-27 15:17:32 UTC (rev 126650) @@ -1,10 +0,0 @@ -; php options -session.save_handler = files -;session.save_path = /var/lib/php5 -session.gc_maxlifetime = 1440 - -; hhvm specific -hhvm.log.level = Warning -hhvm.log.always_log_unhandled_exceptions = true -hhvm.log.runtime_error_reporting_level = 8191 -hhvm.mysql.typed_results = false Copied: hhvm/repos/community-x86_64/php.ini (from rev 126649, hhvm/trunk/php.ini) =================================================================== --- php.ini (rev 0) +++ php.ini 2015-01-27 15:17:32 UTC (rev 126650) @@ -0,0 +1,10 @@ +; php options +session.save_handler = files +;session.save_path = /var/lib/php5 +session.gc_maxlifetime = 1440 + +; hhvm specific +hhvm.log.level = Warning +hhvm.log.always_log_unhandled_exceptions = true +hhvm.log.runtime_error_reporting_level = 8191 +hhvm.mysql.typed_results = false Deleted: server.ini =================================================================== --- server.ini 2015-01-27 15:10:21 UTC (rev 126649) +++ server.ini 2015-01-27 15:17:32 UTC (rev 126650) @@ -1,6 +0,0 @@ -hhvm.server.port = 9000 -hhvm.server.type = fastcgi -hhvm.server.default_document = index.php -hhvm.log.use_log_file = true -hhvm.log.file = /var/log/hhvm/error.log -hhvm.repo.central.path = /var/run/hhvm/hhvm.hhbc Copied: hhvm/repos/community-x86_64/server.ini (from rev 126649, hhvm/trunk/server.ini) =================================================================== --- server.ini (rev 0) +++ server.ini 2015-01-27 15:17:32 UTC (rev 126650) @@ -0,0 +1,6 @@ +hhvm.server.port = 9000 +hhvm.server.type = fastcgi +hhvm.server.default_document = index.php +hhvm.log.use_log_file = true +hhvm.log.file = /var/log/hhvm/error.log +hhvm.repo.central.path = /var/run/hhvm/hhvm.hhbc