Date: Friday, July 31, 2015 @ 14:22:32 Author: mtorromeo Revision: 137637
archrelease: copy trunk to community-x86_64 Added: hhvm/repos/community-x86_64/PKGBUILD (from rev 137636, hhvm/trunk/PKGBUILD) hhvm/repos/community-x86_64/gcc51.patch (from rev 137636, hhvm/trunk/gcc51.patch) hhvm/repos/community-x86_64/hhvm.install (from rev 137636, hhvm/trunk/hhvm.install) hhvm/repos/community-x86_64/hhvm.service (from rev 137636, hhvm/trunk/hhvm.service) hhvm/repos/community-x86_64/hhvm.tmpfile (from rev 137636, hhvm/trunk/hhvm.tmpfile) hhvm/repos/community-x86_64/hhvm@.service (from rev 137636, hhvm/trunk/hhvm@.service) hhvm/repos/community-x86_64/libstdcxx-dual-abi.patch (from rev 137636, hhvm/trunk/libstdcxx-dual-abi.patch) hhvm/repos/community-x86_64/php.ini (from rev 137636, hhvm/trunk/php.ini) hhvm/repos/community-x86_64/server.ini (from rev 137636, 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@.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 | 296 ++++++++++++++++++++++----------------------- gcc51.patch | 28 ++-- hhvm.install | 18 +- hhvm.service | 30 ++-- hhvm.tmpfile | 4 hhvm@.service | 30 ++-- libstdcxx-dual-abi.patch | 92 ++++++------- php.ini | 20 +-- server.ini | 12 - 9 files changed, 265 insertions(+), 265 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2015-07-31 12:10:02 UTC (rev 137636) +++ PKGBUILD 2015-07-31 12:22:32 UTC (rev 137637) @@ -1,148 +0,0 @@ -# $Id$ -# Maintainer: Massimiliano Torromeo <massimiliano.torro...@gmail.com> -# Contributor: James Miller <ja...@pocketrent.com> - -pkgname=hhvm -pkgver=3.8.0 -pkgrel=1 - -_thirdparty_commit=85da228178e69792b0798292b09cd7f4c6522522 -_folly_commit=66476fc9a6c96ff6d7848e5bd20fa0ee2f2dc089 -_thrift_commit=fc092e2b645def21482c1772250a97a7cd003cee -_proxygen_commit=568c2fa559ce64b7f74478418819b6d338f437f4 -_webscalesql_commit=5fc6cf865ba6802c640211885f97de98f3c039b8 -_mcrouter_commit=a47cdd6f297b74928007121e3ae2163c3333e04c -_squangle_commit=8f1cce28ea1af810985968b9a136e29475b9cb4f - -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" - 'hhvm.tmpfile' - 'hhvm.service' - 'hhvm@.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 ../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@.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=('a484fe758bcf8f09105df54d88fc5f1e31c5a5eab64685418cdf6f54a8ea76c9' - 'ff6cea17815e273b006396f7199955494822b41a807de455709a35123975fd28' - '95a25a0cc9c53007d858a1a384ac47507200e68a0da91d0d7bbf73d45999ae3f' - '75ca0d64bba994ab4e3dee1148099049c96d240825068522ef922aa0e477647a' - '6241cef3fc1433166506ca1386b9918a28a225ca9d8d7a80c86604dbd099a0c1' - '449f2f103276b679e198b8769e8779407d13792f44f1fb4c91edc48a5c50a75f' - 'ada0ea092d76c09aba3deb63fa6f287f862b6bd98c0f77a4eeda74d3692ab238' - '16180d228b9d9f5d49ceb47fed524ddd5abfb440f1185f84acb0880ba79051cb' - 'c356010a6d6b976f387bb205a75ea07d5f40593a8010483f2ed0f66f112331bc' - '8b50d1ef9f5f726e6d8d469a8c84d85ad63f8b507b97d258b4d751a0e3e221df' - '59c640602929dac0aa34d06c668ed69361eb4b7b47a77f9aa0badb4d0b61571c' - '3e3093f817706c238fad021483f114fd4ce0b45d84097dcb7870157fc9ec769f' - '5b53bc57965e1c5151d720dc7f63f1b2e8ebd5e758b2ef0be3b74df38ebcbce0' - '3a7d1cfa7fb87365bbfc65975b8a96627c34d5389eb0de9c360f195cb717dfd0' - '8fe2192e3e10d46a77bbe4fda7ed588eecda22fd83d5952c79985f642bf00d68') Copied: hhvm/repos/community-x86_64/PKGBUILD (from rev 137636, hhvm/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2015-07-31 12:22:32 UTC (rev 137637) @@ -0,0 +1,148 @@ +# $Id$ +# Maintainer: Massimiliano Torromeo <massimiliano.torro...@gmail.com> +# Contributor: James Miller <ja...@pocketrent.com> + +pkgname=hhvm +pkgver=3.8.1 +pkgrel=1 + +_thirdparty_commit=85da228178e69792b0798292b09cd7f4c6522522 +_folly_commit=66476fc9a6c96ff6d7848e5bd20fa0ee2f2dc089 +_thrift_commit=fc092e2b645def21482c1772250a97a7cd003cee +_proxygen_commit=568c2fa559ce64b7f74478418819b6d338f437f4 +_webscalesql_commit=5fc6cf865ba6802c640211885f97de98f3c039b8 +_mcrouter_commit=a47cdd6f297b74928007121e3ae2163c3333e04c +_squangle_commit=8f1cce28ea1af810985968b9a136e29475b9cb4f + +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" + 'hhvm.tmpfile' + 'hhvm.service' + 'hhvm@.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 ../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@.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=('5fc1110ecbf9fec3c153eff85812f84407be1afe78e8ef9a5327d8b0c4c04af4' + 'ff6cea17815e273b006396f7199955494822b41a807de455709a35123975fd28' + '95a25a0cc9c53007d858a1a384ac47507200e68a0da91d0d7bbf73d45999ae3f' + '75ca0d64bba994ab4e3dee1148099049c96d240825068522ef922aa0e477647a' + '6241cef3fc1433166506ca1386b9918a28a225ca9d8d7a80c86604dbd099a0c1' + '449f2f103276b679e198b8769e8779407d13792f44f1fb4c91edc48a5c50a75f' + 'ada0ea092d76c09aba3deb63fa6f287f862b6bd98c0f77a4eeda74d3692ab238' + '16180d228b9d9f5d49ceb47fed524ddd5abfb440f1185f84acb0880ba79051cb' + 'c356010a6d6b976f387bb205a75ea07d5f40593a8010483f2ed0f66f112331bc' + '8b50d1ef9f5f726e6d8d469a8c84d85ad63f8b507b97d258b4d751a0e3e221df' + '59c640602929dac0aa34d06c668ed69361eb4b7b47a77f9aa0badb4d0b61571c' + '3e3093f817706c238fad021483f114fd4ce0b45d84097dcb7870157fc9ec769f' + '5b53bc57965e1c5151d720dc7f63f1b2e8ebd5e758b2ef0be3b74df38ebcbce0' + '3a7d1cfa7fb87365bbfc65975b8a96627c34d5389eb0de9c360f195cb717dfd0' + '8fe2192e3e10d46a77bbe4fda7ed588eecda22fd83d5952c79985f642bf00d68') Deleted: gcc51.patch =================================================================== --- gcc51.patch 2015-07-31 12:10:02 UTC (rev 137636) +++ gcc51.patch 2015-07-31 12:22:32 UTC (rev 137637) @@ -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 137636, hhvm/trunk/gcc51.patch) =================================================================== --- gcc51.patch (rev 0) +++ gcc51.patch 2015-07-31 12:22:32 UTC (rev 137637) @@ -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-07-31 12:10:02 UTC (rev 137636) +++ hhvm.install 2015-07-31 12:22:32 UTC (rev 137637) @@ -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 137636, hhvm/trunk/hhvm.install) =================================================================== --- hhvm.install (rev 0) +++ hhvm.install 2015-07-31 12:22:32 UTC (rev 137637) @@ -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-07-31 12:10:02 UTC (rev 137636) +++ hhvm.service 2015-07-31 12:22:32 UTC (rev 137637) @@ -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 137636, hhvm/trunk/hhvm.service) =================================================================== --- hhvm.service (rev 0) +++ hhvm.service 2015-07-31 12:22:32 UTC (rev 137637) @@ -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-07-31 12:10:02 UTC (rev 137636) +++ hhvm.tmpfile 2015-07-31 12:22:32 UTC (rev 137637) @@ -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 137636, hhvm/trunk/hhvm.tmpfile) =================================================================== --- hhvm.tmpfile (rev 0) +++ hhvm.tmpfile 2015-07-31 12:22:32 UTC (rev 137637) @@ -0,0 +1,2 @@ +d /var/run/hhvm 755 http http +d /var/log/hhvm 755 http http Deleted: hhvm@.service =================================================================== --- hhvm@.service 2015-07-31 12:10:02 UTC (rev 137636) +++ hhvm@.service 2015-07-31 12:22:32 UTC (rev 137637) @@ -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 137636, hhvm/trunk/hhvm@.service) =================================================================== --- hhvm@.service (rev 0) +++ hhvm@.service 2015-07-31 12:22:32 UTC (rev 137637) @@ -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-07-31 12:10:02 UTC (rev 137636) +++ libstdcxx-dual-abi.patch 2015-07-31 12:22:32 UTC (rev 137637) @@ -1,46 +0,0 @@ -From ca2e9c7f1b6bf92f1f67ae627692547710932577 Mon Sep 17 00:00:00 2001 -From: Dimitri John Ledkov <dimitri.j.led...@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 137636, hhvm/trunk/libstdcxx-dual-abi.patch) =================================================================== --- libstdcxx-dual-abi.patch (rev 0) +++ libstdcxx-dual-abi.patch 2015-07-31 12:22:32 UTC (rev 137637) @@ -0,0 +1,46 @@ +From ca2e9c7f1b6bf92f1f67ae627692547710932577 Mon Sep 17 00:00:00 2001 +From: Dimitri John Ledkov <dimitri.j.led...@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-07-31 12:10:02 UTC (rev 137636) +++ php.ini 2015-07-31 12:22:32 UTC (rev 137637) @@ -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 137636, hhvm/trunk/php.ini) =================================================================== --- php.ini (rev 0) +++ php.ini 2015-07-31 12:22:32 UTC (rev 137637) @@ -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-07-31 12:10:02 UTC (rev 137636) +++ server.ini 2015-07-31 12:22:32 UTC (rev 137637) @@ -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 137636, hhvm/trunk/server.ini) =================================================================== --- server.ini (rev 0) +++ server.ini 2015-07-31 12:22:32 UTC (rev 137637) @@ -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