[arch-commits] Commit in hhvm/repos/community-x86_64 (18 files)

Massimiliano Torromeo mtorromeo at archlinux.org
Fri Aug 21 10:01:54 UTC 2015


    Date: Friday, August 21, 2015 @ 12:01:53
  Author: mtorromeo
Revision: 138590

archrelease: copy trunk to community-x86_64

Added:
  hhvm/repos/community-x86_64/PKGBUILD
    (from rev 138589, hhvm/trunk/PKGBUILD)
  hhvm/repos/community-x86_64/gcc51.patch
    (from rev 138589, hhvm/trunk/gcc51.patch)
  hhvm/repos/community-x86_64/hhvm.install
    (from rev 138589, hhvm/trunk/hhvm.install)
  hhvm/repos/community-x86_64/hhvm.service
    (from rev 138589, hhvm/trunk/hhvm.service)
  hhvm/repos/community-x86_64/hhvm.tmpfile
    (from rev 138589, hhvm/trunk/hhvm.tmpfile)
  hhvm/repos/community-x86_64/hhvm at .service
    (from rev 138589, hhvm/trunk/hhvm at .service)
  hhvm/repos/community-x86_64/libstdcxx-dual-abi.patch
    (from rev 138589, hhvm/trunk/libstdcxx-dual-abi.patch)
  hhvm/repos/community-x86_64/php.ini
    (from rev 138589, hhvm/trunk/php.ini)
  hhvm/repos/community-x86_64/server.ini
    (from rev 138589, hhvm/trunk/server.ini)
Deleted:
  hhvm/repos/community-x86_64/PKGBUILD
  hhvm/repos/community-x86_64/gcc51.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 at .service
  hhvm/repos/community-x86_64/libstdcxx-dual-abi.patch
  hhvm/repos/community-x86_64/php.ini
  hhvm/repos/community-x86_64/server.ini

--------------------------+
 PKGBUILD                 |  310 ++++++++++++++++++++++-----------------------
 gcc51.patch              |   28 ++--
 hhvm.install             |   18 +-
 hhvm.service             |   30 ++--
 hhvm.tmpfile             |    4 
 hhvm at .service            |   30 ++--
 libstdcxx-dual-abi.patch |   92 ++++++-------
 php.ini                  |   20 +-
 server.ini               |   12 -
 9 files changed, 272 insertions(+), 272 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2015-08-21 10:01:27 UTC (rev 138589)
+++ PKGBUILD	2015-08-21 10:01:53 UTC (rev 138590)
@@ -1,155 +0,0 @@
-# $Id$
-# Maintainer: Massimiliano Torromeo <massimiliano.torromeo at gmail.com>
-# Contributor: James Miller <james at pocketrent.com>
-
-pkgname=hhvm
-pkgver=3.9.0
-pkgrel=1
-
-_thirdparty_commit=5cfbd0ea334de25115546a08a9dbd2954c6f5ed5
-_folly_commit=879db739d6bb0cd6a7035d4606c34c877077c88e
-_thrift_commit=b5635e3675023979c87d8b16182402c1ffba32a4
-_proxygen_commit=885e8444298343ddddbc6948f6bdb7f1d9edc540
-_webscalesql_commit=04456ee8cb3f537537873504b33cdea17e346b12
-_mcrouter_commit=8303e732b94469d213266dc512cece4860875305
-_squangle_commit=2661b7b4ffd2533f1cead7c45d369177d44315ff
-_wangle_commit=6ce19ed9d2a8dd2b68d2b23a180ceb107cb53091
-
-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')
-makedepends=('git' 'cmake' 'gcc' 'boost' 'gflags' 'python2' 'pfff' 'mongodb'
-             'ragel' 'libmariadbclient' 'unixodbc')
-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=('a1d0713b19b615e6008f9c35d7e219fb6030559bbb8baa7c44d92730263aa4aa'
-            '730d60164d5274011cded79ffef1da41f3d667521a6823f7dd91bd912f147406'
-            '3e76945da52a79efa5ead9ffbcca21b8cdb1df85c1648154a94475ee30cc4afb'
-            '72aed344806debe232ac3ed6196e6d1dc11f42926d44b31d9c3d962da5c88a37'
-            'ed8f576d1a0d2cd52f9f24dd0de8ff6fb100cf0ddff0e1d0789f4f10654da676'
-            '6cb667f5e21d32955fdc359a5c490aa5c3d13490a51a82d66325994e0b031b82'
-            'e102aa2453337bd5b1c01e41ae7c60e8f472227dfe4674041a67b600c4b567cb'
-            '5db586f6cb02f4f44089a054276ce2da185fa2de0f4eb85f9fcb0469629fb386'
-            '8cd4166f06925452f70989ef01e579fc1d3989687ecc02ab449d7210bd8758fd'
-            'c356010a6d6b976f387bb205a75ea07d5f40593a8010483f2ed0f66f112331bc'
-            '8b50d1ef9f5f726e6d8d469a8c84d85ad63f8b507b97d258b4d751a0e3e221df'
-            '59c640602929dac0aa34d06c668ed69361eb4b7b47a77f9aa0badb4d0b61571c'
-            '3e3093f817706c238fad021483f114fd4ce0b45d84097dcb7870157fc9ec769f'
-            '5b53bc57965e1c5151d720dc7f63f1b2e8ebd5e758b2ef0be3b74df38ebcbce0'
-            '3a7d1cfa7fb87365bbfc65975b8a96627c34d5389eb0de9c360f195cb717dfd0'
-            '8fe2192e3e10d46a77bbe4fda7ed588eecda22fd83d5952c79985f642bf00d68')

Copied: hhvm/repos/community-x86_64/PKGBUILD (from rev 138589, hhvm/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2015-08-21 10:01:53 UTC (rev 138590)
@@ -0,0 +1,155 @@
+# $Id$
+# Maintainer: Massimiliano Torromeo <massimiliano.torromeo at gmail.com>
+# Contributor: James Miller <james at pocketrent.com>
+
+pkgname=hhvm
+pkgver=3.9.0
+pkgrel=2
+
+_thirdparty_commit=5cfbd0ea334de25115546a08a9dbd2954c6f5ed5
+_folly_commit=879db739d6bb0cd6a7035d4606c34c877077c88e
+_thrift_commit=b5635e3675023979c87d8b16182402c1ffba32a4
+_proxygen_commit=885e8444298343ddddbc6948f6bdb7f1d9edc540
+_webscalesql_commit=04456ee8cb3f537537873504b33cdea17e346b12
+_mcrouter_commit=8303e732b94469d213266dc512cece4860875305
+_squangle_commit=2661b7b4ffd2533f1cead7c45d369177d44315ff
+_wangle_commit=6ce19ed9d2a8dd2b68d2b23a180ceb107cb53091
+
+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=('a1d0713b19b615e6008f9c35d7e219fb6030559bbb8baa7c44d92730263aa4aa'
+            '730d60164d5274011cded79ffef1da41f3d667521a6823f7dd91bd912f147406'
+            '3e76945da52a79efa5ead9ffbcca21b8cdb1df85c1648154a94475ee30cc4afb'
+            '72aed344806debe232ac3ed6196e6d1dc11f42926d44b31d9c3d962da5c88a37'
+            'ed8f576d1a0d2cd52f9f24dd0de8ff6fb100cf0ddff0e1d0789f4f10654da676'
+            '6cb667f5e21d32955fdc359a5c490aa5c3d13490a51a82d66325994e0b031b82'
+            'e102aa2453337bd5b1c01e41ae7c60e8f472227dfe4674041a67b600c4b567cb'
+            '5db586f6cb02f4f44089a054276ce2da185fa2de0f4eb85f9fcb0469629fb386'
+            '8cd4166f06925452f70989ef01e579fc1d3989687ecc02ab449d7210bd8758fd'
+            'c356010a6d6b976f387bb205a75ea07d5f40593a8010483f2ed0f66f112331bc'
+            '8b50d1ef9f5f726e6d8d469a8c84d85ad63f8b507b97d258b4d751a0e3e221df'
+            '59c640602929dac0aa34d06c668ed69361eb4b7b47a77f9aa0badb4d0b61571c'
+            '3e3093f817706c238fad021483f114fd4ce0b45d84097dcb7870157fc9ec769f'
+            '5b53bc57965e1c5151d720dc7f63f1b2e8ebd5e758b2ef0be3b74df38ebcbce0'
+            '3a7d1cfa7fb87365bbfc65975b8a96627c34d5389eb0de9c360f195cb717dfd0'
+            '8fe2192e3e10d46a77bbe4fda7ed588eecda22fd83d5952c79985f642bf00d68')

Deleted: gcc51.patch
===================================================================
--- gcc51.patch	2015-08-21 10:01:27 UTC (rev 138589)
+++ gcc51.patch	2015-08-21 10:01:53 UTC (rev 138590)
@@ -1,14 +0,0 @@
-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-x86_64/gcc51.patch (from rev 138589, hhvm/trunk/gcc51.patch)
===================================================================
--- gcc51.patch	                        (rev 0)
+++ gcc51.patch	2015-08-21 10:01:53 UTC (rev 138590)
@@ -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];

Deleted: hhvm.install
===================================================================
--- hhvm.install	2015-08-21 10:01:27 UTC (rev 138589)
+++ hhvm.install	2015-08-21 10:01:53 UTC (rev 138590)
@@ -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 138589, hhvm/trunk/hhvm.install)
===================================================================
--- hhvm.install	                        (rev 0)
+++ hhvm.install	2015-08-21 10:01:53 UTC (rev 138590)
@@ -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-08-21 10:01:27 UTC (rev 138589)
+++ hhvm.service	2015-08-21 10:01:53 UTC (rev 138590)
@@ -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 138589, hhvm/trunk/hhvm.service)
===================================================================
--- hhvm.service	                        (rev 0)
+++ hhvm.service	2015-08-21 10:01:53 UTC (rev 138590)
@@ -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-08-21 10:01:27 UTC (rev 138589)
+++ hhvm.tmpfile	2015-08-21 10:01:53 UTC (rev 138590)
@@ -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 138589, hhvm/trunk/hhvm.tmpfile)
===================================================================
--- hhvm.tmpfile	                        (rev 0)
+++ hhvm.tmpfile	2015-08-21 10:01:53 UTC (rev 138590)
@@ -0,0 +1,2 @@
+d /var/run/hhvm 755 http http
+d /var/log/hhvm 755 http http

Deleted: hhvm at .service
===================================================================
--- hhvm at .service	2015-08-21 10:01:27 UTC (rev 138589)
+++ hhvm at .service	2015-08-21 10:01:53 UTC (rev 138590)
@@ -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 at .service (from rev 138589, hhvm/trunk/hhvm at .service)
===================================================================
--- hhvm at .service	                        (rev 0)
+++ hhvm at .service	2015-08-21 10:01:53 UTC (rev 138590)
@@ -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: libstdcxx-dual-abi.patch
===================================================================
--- libstdcxx-dual-abi.patch	2015-08-21 10:01:27 UTC (rev 138589)
+++ libstdcxx-dual-abi.patch	2015-08-21 10:01:53 UTC (rev 138590)
@@ -1,46 +0,0 @@
-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-x86_64/libstdcxx-dual-abi.patch (from rev 138589, hhvm/trunk/libstdcxx-dual-abi.patch)
===================================================================
--- libstdcxx-dual-abi.patch	                        (rev 0)
+++ libstdcxx-dual-abi.patch	2015-08-21 10:01:53 UTC (rev 138590)
@@ -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>

Deleted: php.ini
===================================================================
--- php.ini	2015-08-21 10:01:27 UTC (rev 138589)
+++ php.ini	2015-08-21 10:01:53 UTC (rev 138590)
@@ -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 138589, hhvm/trunk/php.ini)
===================================================================
--- php.ini	                        (rev 0)
+++ php.ini	2015-08-21 10:01:53 UTC (rev 138590)
@@ -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-08-21 10:01:27 UTC (rev 138589)
+++ server.ini	2015-08-21 10:01:53 UTC (rev 138590)
@@ -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 138589, hhvm/trunk/server.ini)
===================================================================
--- server.ini	                        (rev 0)
+++ server.ini	2015-08-21 10:01:53 UTC (rev 138590)
@@ -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