[arch-commits] Commit in hhvm/repos (10 files)
Evangelos Foutras
foutrelis at archlinux.org
Tue Nov 10 13:11:36 UTC 2015
Date: Tuesday, November 10, 2015 @ 14:11:36
Author: foutrelis
Revision: 146491
archrelease: copy trunk to community-staging-x86_64
Added:
hhvm/repos/community-staging-x86_64/
hhvm/repos/community-staging-x86_64/PKGBUILD
(from rev 146490, hhvm/trunk/PKGBUILD)
hhvm/repos/community-staging-x86_64/gcc51.patch
(from rev 146490, hhvm/trunk/gcc51.patch)
hhvm/repos/community-staging-x86_64/hhvm.install
(from rev 146490, hhvm/trunk/hhvm.install)
hhvm/repos/community-staging-x86_64/hhvm.service
(from rev 146490, hhvm/trunk/hhvm.service)
hhvm/repos/community-staging-x86_64/hhvm.tmpfile
(from rev 146490, hhvm/trunk/hhvm.tmpfile)
hhvm/repos/community-staging-x86_64/hhvm at .service
(from rev 146490, hhvm/trunk/hhvm at .service)
hhvm/repos/community-staging-x86_64/libstdcxx-dual-abi.patch
(from rev 146490, hhvm/trunk/libstdcxx-dual-abi.patch)
hhvm/repos/community-staging-x86_64/php.ini
(from rev 146490, hhvm/trunk/php.ini)
hhvm/repos/community-staging-x86_64/server.ini
(from rev 146490, hhvm/trunk/server.ini)
--------------------------+
PKGBUILD | 155 +++++++++++++++++++++++++++++++++++++++++++++
gcc51.patch | 14 ++++
hhvm.install | 9 ++
hhvm.service | 15 ++++
hhvm.tmpfile | 2
hhvm at .service | 15 ++++
libstdcxx-dual-abi.patch | 46 +++++++++++++
php.ini | 10 ++
server.ini | 6 +
9 files changed, 272 insertions(+)
Copied: hhvm/repos/community-staging-x86_64/PKGBUILD (from rev 146490, hhvm/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2015-11-10 13:11:36 UTC (rev 146491)
@@ -0,0 +1,155 @@
+# $Id$
+# Maintainer: Massimiliano Torromeo <massimiliano.torromeo at gmail.com>
+# Contributor: James Miller <james at pocketrent.com>
+
+pkgname=hhvm
+pkgver=3.10.1
+pkgrel=3
+
+_thirdparty_commit=25006693fa6f5f09123d915225bc1b240102dfd6
+_folly_commit=3a6c9d3896badace174e6933c0a764f740e921c8
+_mcrouter_commit=2d51823b9516c9609da3c7c5022357ec33cd25f6
+_proxygen_commit=080b2b157915f7e970d9c406659ad4f8f9f0bedd
+_squangle_commit=8a074e1550c904816debb2221a829e0a4b1b6261
+_thrift_commit=181044fd78e0a26e77fb519e1cbd10238c2e32d6
+_wangle_commit=c1e434b725ca7e8336a0401f4bed548ea1aefc78
+_webscalesql_commit=04456ee8cb3f537537873504b33cdea17e346b12
+
+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' 're2'
+ 'gperf' 'c-client' 'unixodbc')
+makedepends=('git' 'cmake' 'gcc' 'boost' 'gflags' 'python2' 'pfff' 'mongodb'
+ 'ragel' 'libmariadbclient')
+source=("https://github.com/facebook/hhvm/archive/HHVM-$pkgver.tar.gz"
+ "https://github.com/hhvm/hhvm-third-party/archive/$_thirdparty_commit/hhvm-third-party-$_thirdparty_commit.tar.gz"
+ "https://github.com/facebook/folly/archive/$_folly_commit/folly-$_folly_commit.tar.gz"
+ "https://github.com/facebook/fbthrift/archive/$_thrift_commit/thrift-$_thrift_commit.tar.gz"
+ "https://github.com/facebook/proxygen/archive/$_proxygen_commit/proxygen-$_proxygen_commit.tar.gz"
+ "https://github.com/webscalesql/webscalesql-5.6/archive/$_webscalesql_commit/webscalesql-$_webscalesql_commit.tar.gz"
+ "https://github.com/facebook/mcrouter/archive/$_mcrouter_commit/mcrouter-$_mcrouter_commit.tar.gz"
+ "https://github.com/facebook/squangle/archive/$_squangle_commit/squangle-$_squangle_commit.tar.gz"
+ "https://github.com/facebook/wangle/archive/$_wangle_commit/wangle-$_wangle_commit.tar.gz"
+ 'hhvm.tmpfile'
+ 'hhvm.service'
+ 'hhvm at .service'
+ 'php.ini'
+ 'server.ini'
+ 'gcc51.patch'
+ 'libstdcxx-dual-abi.patch')
+install=hhvm.install
+backup=(etc/hhvm/{php,server}.ini)
+options+=('!buildflags')
+
+prepare() {
+ cd "$srcdir"/$pkgname-HHVM-$pkgver
+
+ sed -r 's/service hhvm (start|stop|restart)/systemctl \1 hhvm.service/' \
+ -i hphp/tools/oss-repo-mode
+
+ patch -p1 -i "$srcdir"/gcc51.patch
+
+ # Fix sendmail path
+ sed -r 's#/usr/lib/sendmail#/usr/bin/sendmail#g' -i \
+ hphp/runtime/base/runtime-option.cpp
+
+ 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
+ patch -d src -p1 -i "$srcdir"/libstdcxx-dual-abi.patch
+
+ cd ../thrift
+ rm -rf src
+ ln -s "$srcdir"/fbthrift-$_thrift_commit src
+
+ cd ../proxygen
+ rm -rf src
+ ln -s "$srcdir"/proxygen-$_proxygen_commit src
+
+ cd ../mcrouter
+ rm -rf src
+ ln -s "$srcdir"/mcrouter-$_mcrouter_commit src
+
+ cd ../wangle
+ rm -rf src
+ ln -s "$srcdir"/wangle-$_wangle_commit src
+
+ cd ../squangle
+ rm -rf src squangle
+ ln -s "$srcdir"/squangle-$_squangle_commit src
+ ln -s src/squangle
+
+ cd ../webscalesqlclient
+ rm -rf src webscalesql-5.6
+ ln -s "$srcdir"/webscalesql-5.6-$_webscalesql_commit webscalesql-5.6
+ ln -s "$srcdir"/webscalesql-5.6-$_webscalesql_commit src
+}
+
+build() {
+ cd "$srcdir"/$pkgname-HHVM-$pkgver
+ msg2 "Building hhvm"
+
+ cmake -Wno-dev \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=lib \
+ -DCMAKE_PREFIX_PATH="$srcdir" \
+ -DENABLE_MONGO:BOOL=ON \
+ -DMYSQL_UNIX_SOCK_ADDR=/run/mysqld/mysqld.sock \
+ .
+
+ 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
+
+ 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 at .service "$pkgdir"/usr/lib/systemd/system/hhvm at .service
+
+ install -Dm644 php.ini "$pkgdir"/etc/hhvm/php.ini
+ install -Dm644 server.ini "$pkgdir"/etc/hhvm/server.ini
+}
+
+sha256sums=('cdb7002f3cb8252f706fdf1ec7fc03a52a56cd2d8d9c3ee0951d82a1acf80fad'
+ '1dd63ae9304bd49a5f43e04ff64866f03e826e287c6387a0cc1a31e67c7279eb'
+ 'ffca3a5d1867f104fd6a6699312d6c12ad6364cec24c05d6d5901ef79e974f59'
+ '945e7100d14f44dd82f006742b5c5d703f979f034f701d14a99f2b2f1aaec5c6'
+ 'f8debd25e76a4c9a645e5aa7b49568085f88445ac869e57c2580b343289f5dc3'
+ '6cb667f5e21d32955fdc359a5c490aa5c3d13490a51a82d66325994e0b031b82'
+ '235dc77e49f067da3032925d4742758cbce0bc95c5b694c0891287aca888e152'
+ '163be1619b94bdd758f8e06d10909ef12e6c3c6ebd53a27b33d0b37d9b4ef7ea'
+ 'a5534f1d6f975117ec27cfb354052ebb88fda3a7339b13de33c30ea468e84b1e'
+ 'c356010a6d6b976f387bb205a75ea07d5f40593a8010483f2ed0f66f112331bc'
+ '8b50d1ef9f5f726e6d8d469a8c84d85ad63f8b507b97d258b4d751a0e3e221df'
+ '59c640602929dac0aa34d06c668ed69361eb4b7b47a77f9aa0badb4d0b61571c'
+ '3e3093f817706c238fad021483f114fd4ce0b45d84097dcb7870157fc9ec769f'
+ '5b53bc57965e1c5151d720dc7f63f1b2e8ebd5e758b2ef0be3b74df38ebcbce0'
+ '3a7d1cfa7fb87365bbfc65975b8a96627c34d5389eb0de9c360f195cb717dfd0'
+ '8fe2192e3e10d46a77bbe4fda7ed588eecda22fd83d5952c79985f642bf00d68')
Copied: hhvm/repos/community-staging-x86_64/gcc51.patch (from rev 146490, hhvm/trunk/gcc51.patch)
===================================================================
--- community-staging-x86_64/gcc51.patch (rev 0)
+++ community-staging-x86_64/gcc51.patch 2015-11-10 13:11:36 UTC (rev 146491)
@@ -0,0 +1,14 @@
+diff --git a/hphp/runtime/vm/jit/vasm-xls.cpp b/hphp/runtime/vm/jit/vasm-xls.cpp
+index b07f3f3..48bfd5b 100644
+--- a/hphp/runtime/vm/jit/vasm-xls.cpp
++++ b/hphp/runtime/vm/jit/vasm-xls.cpp
+@@ -2047,6 +2047,9 @@ void Vxls::insertCopiesAt(jit::vector<Vinstr>& code, unsigned& j,
+ return sf_ivl && !sf_ivl->ranges.empty() && sf_ivl->covers(pos);
+ };
+ MovePlan moves;
++ for (auto reg : moves) {
++ moves[reg] = InvalidReg;
++ }
+ jit::vector<Vinstr> loads;
+ for (auto dst : copies) {
+ auto ivl = copies[dst];
Copied: hhvm/repos/community-staging-x86_64/hhvm.install (from rev 146490, hhvm/trunk/hhvm.install)
===================================================================
--- community-staging-x86_64/hhvm.install (rev 0)
+++ community-staging-x86_64/hhvm.install 2015-11-10 13:11:36 UTC (rev 146491)
@@ -0,0 +1,9 @@
+post_install() {
+ if [[ ! -d run/hhvm ]]; then
+ usr/bin/systemd-tmpfiles --create hhvm.conf
+ fi
+}
+
+post_upgrade() {
+ post_install
+}
Copied: hhvm/repos/community-staging-x86_64/hhvm.service (from rev 146490, hhvm/trunk/hhvm.service)
===================================================================
--- community-staging-x86_64/hhvm.service (rev 0)
+++ community-staging-x86_64/hhvm.service 2015-11-10 13:11:36 UTC (rev 146491)
@@ -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
Copied: hhvm/repos/community-staging-x86_64/hhvm.tmpfile (from rev 146490, hhvm/trunk/hhvm.tmpfile)
===================================================================
--- community-staging-x86_64/hhvm.tmpfile (rev 0)
+++ community-staging-x86_64/hhvm.tmpfile 2015-11-10 13:11:36 UTC (rev 146491)
@@ -0,0 +1,2 @@
+d /var/run/hhvm 755 http http
+d /var/log/hhvm 755 http http
Copied: hhvm/repos/community-staging-x86_64/hhvm at .service (from rev 146490, hhvm/trunk/hhvm at .service)
===================================================================
--- community-staging-x86_64/hhvm at .service (rev 0)
+++ community-staging-x86_64/hhvm at .service 2015-11-10 13:11:36 UTC (rev 146491)
@@ -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
Copied: hhvm/repos/community-staging-x86_64/libstdcxx-dual-abi.patch (from rev 146490, hhvm/trunk/libstdcxx-dual-abi.patch)
===================================================================
--- community-staging-x86_64/libstdcxx-dual-abi.patch (rev 0)
+++ community-staging-x86_64/libstdcxx-dual-abi.patch 2015-11-10 13:11:36 UTC (rev 146491)
@@ -0,0 +1,46 @@
+From ca2e9c7f1b6bf92f1f67ae627692547710932577 Mon Sep 17 00:00:00 2001
+From: Dimitri John Ledkov <dimitri.j.ledkov at intel.com>
+Date: Wed, 27 May 2015 13:30:08 +0100
+Subject: [PATCH] Fix forward declaration of basic_string and list, for dual
+ abi libstdc++ with inline std::__cxx11 namespace.
+
+Closes facebook/folly#213
+Closes facebook/folly#208
+---
+ folly/Traits.h | 12 +++---------
+ 1 file changed, 3 insertions(+), 9 deletions(-)
+
+diff --git a/folly/Traits.h b/folly/Traits.h
+index 309157c..a279c02 100644
+--- a/folly/Traits.h
++++ b/folly/Traits.h
+@@ -19,6 +19,9 @@
+ #ifndef FOLLY_BASE_TRAITS_H_
+ #define FOLLY_BASE_TRAITS_H_
+
++#include <list>
++#include <string>
++
+ #include <memory>
+ #include <limits>
+ #include <type_traits>
+@@ -239,19 +242,10 @@ FOLLY_NAMESPACE_STD_BEGIN
+
+ template <class T, class U>
+ struct pair;
+-#ifndef _GLIBCXX_USE_FB
+-template <class T, class R, class A>
+- class basic_string;
+-#else
+-template <class T, class R, class A, class S>
+- class basic_string;
+-#endif
+ template <class T, class A>
+ class vector;
+ template <class T, class A>
+ class deque;
+-template <class T, class A>
+- class list;
+ template <class T, class C, class A>
+ class set;
+ template <class K, class V, class C, class A>
Copied: hhvm/repos/community-staging-x86_64/php.ini (from rev 146490, hhvm/trunk/php.ini)
===================================================================
--- community-staging-x86_64/php.ini (rev 0)
+++ community-staging-x86_64/php.ini 2015-11-10 13:11:36 UTC (rev 146491)
@@ -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
Copied: hhvm/repos/community-staging-x86_64/server.ini (from rev 146490, hhvm/trunk/server.ini)
===================================================================
--- community-staging-x86_64/server.ini (rev 0)
+++ community-staging-x86_64/server.ini 2015-11-10 13:11:36 UTC (rev 146491)
@@ -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
More information about the arch-commits
mailing list