Date: Friday, December 11, 2015 @ 12:07:41 Author: mtorromeo Revision: 152814
upgpkg: hhvm 3.11.0-1 Updated to 3.11.0 Modified: hhvm/trunk/PKGBUILD Deleted: hhvm/trunk/gcc51.patch hhvm/trunk/libstdcxx-dual-abi.patch --------------------------+ PKGBUILD | 56 +++++++++++++++++++-------------------------- gcc51.patch | 14 ----------- libstdcxx-dual-abi.patch | 46 ------------------------------------ 3 files changed, 24 insertions(+), 92 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-12-11 09:48:59 UTC (rev 152813) +++ PKGBUILD 2015-12-11 11:07:41 UTC (rev 152814) @@ -3,17 +3,17 @@ # Contributor: James Miller <[email protected]> pkgname=hhvm -pkgver=3.10.1 -pkgrel=4 +pkgver=3.11.0 +pkgrel=1 -_thirdparty_commit=25006693fa6f5f09123d915225bc1b240102dfd6 -_folly_commit=3a6c9d3896badace174e6933c0a764f740e921c8 -_mcrouter_commit=2d51823b9516c9609da3c7c5022357ec33cd25f6 -_proxygen_commit=080b2b157915f7e970d9c406659ad4f8f9f0bedd -_squangle_commit=8a074e1550c904816debb2221a829e0a4b1b6261 -_thrift_commit=181044fd78e0a26e77fb519e1cbd10238c2e32d6 -_wangle_commit=c1e434b725ca7e8336a0401f4bed548ea1aefc78 -_webscalesql_commit=04456ee8cb3f537537873504b33cdea17e346b12 +_thirdparty_commit=5211c1aeaf5dd24ac41149c6b05e24f4a52da23f +_folly_commit=7ce0da391198be14d4a12a42f918d90ceba63b31 +_mcrouter_commit=cb05bfa78209fb5f49b1af7e04553d8429ae3d7a +_proxygen_commit=1cc6552541156f94dd47808f3024fbebf1d8fc2c +_squangle_commit=5efc6ad1a6d5078e836bf9c0b6d58416cc3f234e +_thrift_commit=814ff42fa8912c97ff20f4fc90536243b8de9d59 +_wangle_commit=30c42a4ae96a0a33aa016a7b7d0ad6414cf9a62a +_webscalesql_commit=a9e580b5a0baa768210ef10544c8fab52003ec0b pkgdesc="Virtual Machine, Runtime, and JIT for PHP" arch=('x86_64') @@ -30,7 +30,7 @@ "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/mysql-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"; @@ -38,9 +38,7 @@ 'hhvm.service' '[email protected]' 'php.ini' - 'server.ini' - 'gcc51.patch' - 'libstdcxx-dual-abi.patch') + 'server.ini') install=hhvm.install backup=(etc/hhvm/{php,server}.ini) options+=('!buildflags') @@ -51,8 +49,6 @@ sed -r 's/service hhvm (start|stop|restart)/systemctl \1 hhvm.service/' \ -i hphp/tools/oss-repo-mode - patch -p1 -i "$srcdir"/gcc51.patch - # Need to remove this to link to system boost and google-glog sed -i 's/-D_GLIBCXX_USE_CXX11_ABI=0//' CMake/HPHPCompiler.cmake @@ -66,7 +62,6 @@ 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 @@ -90,9 +85,8 @@ 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 + rm -rf mysql-5.6 + ln -s "$srcdir"/mysql-5.6-$_webscalesql_commit mysql-5.6 } build() { @@ -140,19 +134,17 @@ install -Dm644 server.ini "$pkgdir"/etc/hhvm/server.ini } -sha256sums=('cdb7002f3cb8252f706fdf1ec7fc03a52a56cd2d8d9c3ee0951d82a1acf80fad' - '1dd63ae9304bd49a5f43e04ff64866f03e826e287c6387a0cc1a31e67c7279eb' - 'ffca3a5d1867f104fd6a6699312d6c12ad6364cec24c05d6d5901ef79e974f59' - '945e7100d14f44dd82f006742b5c5d703f979f034f701d14a99f2b2f1aaec5c6' - 'f8debd25e76a4c9a645e5aa7b49568085f88445ac869e57c2580b343289f5dc3' - '6cb667f5e21d32955fdc359a5c490aa5c3d13490a51a82d66325994e0b031b82' - '235dc77e49f067da3032925d4742758cbce0bc95c5b694c0891287aca888e152' - '163be1619b94bdd758f8e06d10909ef12e6c3c6ebd53a27b33d0b37d9b4ef7ea' - 'a5534f1d6f975117ec27cfb354052ebb88fda3a7339b13de33c30ea468e84b1e' +sha256sums=('b135e23d7e4bb9742d469bfc317374c1fa56ef52a5b972a5f9d409a920df58a4' + '11fe0cd67b07a3f5097946a266f55469af95a101c8703a89586d0a44c3dcd7e5' + '75c65aff273dd01dd0314677bdfb6c9f54b9bb87e37b386f65c4ab77f15bea8f' + '24dde294820785b609f8ab3c36918bdab1b7e49adc23de7e36abea9e76f7b6d0' + '1a6b070264a1276aaecef9836001a8a190893ef8711e712350652a7260e53a25' + '06983fb95386626dc1a2fdfda2d2632d8f8851b7ad03ec3bef2046f5736af3ab' + 'f9d16dab7775298a1673e5cc68b2f9c9a1a1f94e34f27930dbb7205c5c9240e9' + '8919dd3efba1266b5d05bead0c9ae5d786c3c549d71edbfd862133c83dea1f4e' + '816c938c7b6ea147481f117adc8eafe424cff9c8608c4c5c9bb2dd6debbedb1e' 'c356010a6d6b976f387bb205a75ea07d5f40593a8010483f2ed0f66f112331bc' '8b50d1ef9f5f726e6d8d469a8c84d85ad63f8b507b97d258b4d751a0e3e221df' '59c640602929dac0aa34d06c668ed69361eb4b7b47a77f9aa0badb4d0b61571c' '3e3093f817706c238fad021483f114fd4ce0b45d84097dcb7870157fc9ec769f' - '5b53bc57965e1c5151d720dc7f63f1b2e8ebd5e758b2ef0be3b74df38ebcbce0' - '3a7d1cfa7fb87365bbfc65975b8a96627c34d5389eb0de9c360f195cb717dfd0' - '8fe2192e3e10d46a77bbe4fda7ed588eecda22fd83d5952c79985f642bf00d68') + '5b53bc57965e1c5151d720dc7f63f1b2e8ebd5e758b2ef0be3b74df38ebcbce0') Deleted: gcc51.patch =================================================================== --- gcc51.patch 2015-12-11 09:48:59 UTC (rev 152813) +++ gcc51.patch 2015-12-11 11:07:41 UTC (rev 152814) @@ -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]; Deleted: libstdcxx-dual-abi.patch =================================================================== --- libstdcxx-dual-abi.patch 2015-12-11 09:48:59 UTC (rev 152813) +++ libstdcxx-dual-abi.patch 2015-12-11 11:07:41 UTC (rev 152814) @@ -1,46 +0,0 @@ -From ca2e9c7f1b6bf92f1f67ae627692547710932577 Mon Sep 17 00:00:00 2001 -From: Dimitri John Ledkov <[email protected]> -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>
