[arch-commits] Commit in hhvm/trunk (PKGBUILD namespaces.patch)
Massimiliano Torromeo
mtorromeo at archlinux.org
Mon Jun 13 11:19:56 UTC 2016
Date: Monday, June 13, 2016 @ 13:19:56
Author: mtorromeo
Revision: 179889
upgpkg: hhvm 3.14.0-1
Updated to 3.14.0
Modified:
hhvm/trunk/PKGBUILD
Deleted:
hhvm/trunk/namespaces.patch
------------------+
PKGBUILD | 49 +++++++++---------
namespaces.patch | 143 -----------------------------------------------------
2 files changed, 26 insertions(+), 166 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2016-06-13 11:17:18 UTC (rev 179888)
+++ PKGBUILD 2016-06-13 11:19:56 UTC (rev 179889)
@@ -3,16 +3,17 @@
# Contributor: James Miller <james at pocketrent.com>
pkgname=hhvm
-pkgver=3.13.2
-pkgrel=2
+pkgver=3.14.0
+pkgrel=1
-_thirdparty_commit=57ddc7942877befb97ecc3df2581a4de119049aa
-_folly_commit=add5a7aeacacb050c4b0bad84aac1475fa2658c9
-_mcrouter_commit=fa3892ced1a5525b947828c9860861f8d97c8ae0
-_proxygen_commit=61e339de02b1537c943506fa1a0570c4f8fa3cc0
-_squangle_commit=e0fc74959076c552efb56b4c62aa373364640421
-_thrift_commit=f6da2972faf97639f96e2d879b4649ab3b5b6d17
-_wangle_commit=ec31c0496f606a3c8e6f90f7d5441db9f2a74618
+_thirdparty_commit=e1fcf90c07e0af00906f98cde8aa828bec7b2e01
+_brotli_commit=98ed7a23a83d64133b0a36a884e489bffb0eb864
+_folly_commit=05cdf111f5e6a4585a5e9140fda26f4fea070637
+_mcrouter_commit=679c32548ef7d3c8624b15c0c38f584b37177478
+_proxygen_commit=0b0b50c08b2165f4ed4e4f374ddbeabbc8582e44
+_squangle_commit=36a61d13d03e72dc710028d48de5616f9926128a
+_thrift_commit=8672f88b084d2d5242016f2a4df282ee2c6d4023
+_wangle_commit=4903f961a88751e684f703aaf08511cd5c486a84
_webscalesql_commit=a9e580b5a0baa768210ef10544c8fab52003ec0b
pkgdesc="Virtual Machine, Runtime, and JIT for PHP"
@@ -28,6 +29,7 @@
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/google/brotli/archive/$_brotli_commit/brotli-$_brotli_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/facebook/mysql-5.6/archive/$_webscalesql_commit/webscalesql-$_webscalesql_commit.tar.gz"
@@ -38,8 +40,7 @@
'hhvm.service'
'hhvm at .service'
'php.ini'
- 'server.ini'
- 'namespaces.patch')
+ 'server.ini')
install=hhvm.install
backup=(etc/hhvm/{php,server}.ini)
options+=('!buildflags')
@@ -47,8 +48,6 @@
prepare() {
cd "$srcdir"/$pkgname-HHVM-$pkgver
- patch -p1 -i "$srcdir"/namespaces.patch
-
sed 's/TypedValue m_extraArgs\[\];/TypedValue m_extraArgs[0];/' \
-i hphp/runtime/vm/bytecode.h
@@ -66,6 +65,10 @@
rm -rf src
ln -s "$srcdir"/folly-$_folly_commit src
+ cd ../brotli
+ rm -rf src
+ ln -s "$srcdir"/brotli-$_brotli_commit src
+
cd ../thrift
rm -rf src
ln -s "$srcdir"/fbthrift-$_thrift_commit src
@@ -137,18 +140,18 @@
install -Dm644 server.ini "$pkgdir"/etc/hhvm/server.ini
}
-sha256sums=('239f08214de3d108b70e9bc70f219d0230fcff4762efd2b0266a0b251fac0b3e'
- '58c1ff59791c7e9aca6f4225a006f7dffa824f3b37a1aa07246698dda32c6c50'
- '9f93911918c911d15752871a4f8149749bb5e510054e90d45821d7b2e763d489'
- 'e489bcd7318bdcd9f96f5ed9b561a071e288cc4e4a4665442ef7e383ab103059'
- '255197d59ee50b0c5f3fabf8959c1fb4497080b6dd041a301750a4e362e4de8b'
+sha256sums=('6c99ba49a939b15f298935c0d52f3b2463b5e1b2fbf343df795a11909f5f0aa4'
+ '06e4d11a9eb7385a035df4cccf7d5bcd45bedaea28394e2c50b9565b9aaf843b'
+ '3c73b24518539ab5ba0d351931124dafddda37a44640528ff53dbd76acbe0089'
+ '95f389831f134c203917f5c6802968006767d0c4f2cc20c1ca22ed28cd925700'
+ 'c7e7d551f8b05e7ab7ff391b9e26ae593fefc07a64ceacc41abf4f8935928d8b'
+ '3c13e24e50ad62dbb809087264aa418333c8e0644bf8d727e9f29fcf398f6762'
'06983fb95386626dc1a2fdfda2d2632d8f8851b7ad03ec3bef2046f5736af3ab'
- '90e0bc1e438f6d9768dfa49dd90ae3dea9b9fac5d2818cd1dffe014d691ab3ff'
- 'bacb1913487c19faf7bf45cc8b3942bfd76233ebe0f3884081fa932da7cd1dd3'
- '0430de8aaf658cabd90ab1cb04b09778a7d6ff2eaa6b73bfbd6415371b3459aa'
+ 'f4df002985bf5a701191fda4dfbe03d322c8c7ee018a38578d9f62721c328cad'
+ '8ad07e8a8656f3f88938bf98e71a582d194d0bcab7d474750c1dddaa29201c59'
+ '31f0d4368e65740112d9621dc58fae5e076fcf6c77f52ebde3a0648f5e1cebc5'
'c356010a6d6b976f387bb205a75ea07d5f40593a8010483f2ed0f66f112331bc'
'8b50d1ef9f5f726e6d8d469a8c84d85ad63f8b507b97d258b4d751a0e3e221df'
'59c640602929dac0aa34d06c668ed69361eb4b7b47a77f9aa0badb4d0b61571c'
'3e3093f817706c238fad021483f114fd4ce0b45d84097dcb7870157fc9ec769f'
- '5b53bc57965e1c5151d720dc7f63f1b2e8ebd5e758b2ef0be3b74df38ebcbce0'
- '49aa0e42f416493b318ff54e780e5282683a806efa4f9ce42b6eac2da4115c4f')
+ '5b53bc57965e1c5151d720dc7f63f1b2e8ebd5e758b2ef0be3b74df38ebcbce0')
Deleted: namespaces.patch
===================================================================
--- namespaces.patch 2016-06-13 11:17:18 UTC (rev 179888)
+++ namespaces.patch 2016-06-13 11:19:56 UTC (rev 179889)
@@ -1,143 +0,0 @@
-diff --git a/hphp/runtime/base/tv-helpers.cpp b/hphp/runtime/base/tv-helpers.cpp
-index 4e01e81..1a872dd 100644
---- a/hphp/runtime/base/tv-helpers.cpp
-+++ b/hphp/runtime/base/tv-helpers.cpp
-@@ -14,6 +14,8 @@
- +----------------------------------------------------------------------+
- */
-
-+#include <cmath>
-+
- #include "hphp/runtime/base/tv-helpers.h"
-
- #include "hphp/runtime/base/dummy-resource.h"
-@@ -673,7 +675,7 @@ bool tvCoerceParamToInt64InPlace(TypedValue* tv) {
- if (RuntimeOption::PHP7_ScalarTypes && tv->m_type == KindOfDouble) {
- if (tv->m_data.dbl < std::numeric_limits<int64_t>::min()) return false;
- if (tv->m_data.dbl > std::numeric_limits<int64_t>::max()) return false;
-- if (isnan(tv->m_data.dbl)) return false;
-+ if (std::isnan(tv->m_data.dbl)) return false;
- }
- tvCastToInt64InPlace(tv);
- return true;
-diff --git a/hphp/runtime/base/zend-printf.cpp b/hphp/runtime/base/zend-printf.cpp
-index a008f3a..c6f0fa4 100644
---- a/hphp/runtime/base/zend-printf.cpp
-+++ b/hphp/runtime/base/zend-printf.cpp
-@@ -18,6 +18,7 @@
- #include "hphp/runtime/base/zend-printf.h"
-
- #include <math.h>
-+#include <cmath>
-
- #include "hphp/runtime/base/array-iterator.h"
- #include "hphp/runtime/base/builtin-functions.h"
-@@ -693,14 +694,14 @@ inline static void appenddouble(StringBuffer *buffer,
- precision = MAX_FLOAT_PRECISION;
- }
-
-- if (isnan(number)) {
-+ if (std::isnan(number)) {
- is_negative = (number<0);
- appendstring(buffer, "NaN", 3, 0, padding,
- alignment, 3, is_negative, 0, always_sign);
- return;
- }
-
-- if (isinf(number)) {
-+ if (std::isinf(number)) {
- is_negative = (number<0);
- appendstring(buffer, "INF", 3, 0, padding,
- alignment, 3, is_negative, 0, always_sign);
-@@ -1407,10 +1408,10 @@ static int xbuf_format_converter(char **outbuf, const char *fmt, va_list ap)
- goto fmt_error;
- }
-
-- if (isnan(fp_num)) {
-+ if (std::isnan(fp_num)) {
- s = const_cast<char*>("nan");
- s_len = 3;
-- } else if (isinf(fp_num)) {
-+ } else if (std::isinf(fp_num)) {
- s = const_cast<char*>("inf");
- s_len = 3;
- } else {
-@@ -1448,11 +1449,11 @@ static int xbuf_format_converter(char **outbuf, const char *fmt, va_list ap)
- goto fmt_error;
- }
-
-- if (isnan(fp_num)) {
-+ if (std::isnan(fp_num)) {
- s = const_cast<char*>("NAN");
- s_len = 3;
- break;
-- } else if (isinf(fp_num)) {
-+ } else if (std::isinf(fp_num)) {
- if (fp_num > 0) {
- s = const_cast<char*>("INF");
- s_len = 3;
-diff --git a/hphp/runtime/ext/std/ext_std_math.cpp b/hphp/runtime/ext/std/ext_std_math.cpp
-index 7bb7390..2d6da60 100644
---- a/hphp/runtime/ext/std/ext_std_math.cpp
-+++ b/hphp/runtime/ext/std/ext_std_math.cpp
-@@ -24,6 +24,8 @@
- #include "hphp/runtime/ext/std/ext_std.h"
- #include "hphp/system/constants.h"
-
-+#include <cmath>
-+
- namespace HPHP {
- ///////////////////////////////////////////////////////////////////////////////
-
-@@ -187,9 +189,9 @@ Variant HHVM_FUNCTION(abs, const Variant& number) {
- }
- }
-
- bool HHVM_FUNCTION(is_finite, double val) { return std::isfinite(val);}
--bool HHVM_FUNCTION(is_infinite, double val) { return isinf(val);}
--bool HHVM_FUNCTION(is_nan, double val) { return isnan(val);}
-+bool HHVM_FUNCTION(is_infinite, double val) { return std::isinf(val);}
-+bool HHVM_FUNCTION(is_nan, double val) { return std::isnan(val);}
-
- Variant HHVM_FUNCTION(ceil, const Variant& number) {
- int64_t ival;
-diff --git a/hphp/runtime/ext_zend_compat/php-src/main/snprintf.cpp b/hphp/runtime/ext_zend_compat/php-src/main/snprintf.cpp
-index 352c4f8..7745085 100644
---- a/hphp/runtime/ext_zend_compat/php-src/main/snprintf.cpp
-+++ b/hphp/runtime/ext_zend_compat/php-src/main/snprintf.cpp
-@@ -29,6 +29,8 @@
- #include <stdlib.h>
- #include <math.h>
-
-+#include <cmath>
-+
- #ifdef HAVE_INTTYPES_H
- #include <inttypes.h>
- #endif
-@@ -989,10 +991,10 @@ static int format_converter(register buffy * odp, const char *fmt, va_list ap) /
- goto fmt_error;
- }
-
-- if (zend_isnan(fp_num)) {
-+ if (std::isnan(fp_num)) {
- s = "NAN";
- s_len = 3;
-- } else if (zend_isinf(fp_num)) {
-+ } else if (std::isinf(fp_num)) {
- s = "INF";
- s_len = 3;
- } else {
-@@ -1030,11 +1032,11 @@ static int format_converter(register buffy * odp, const char *fmt, va_list ap) /
- goto fmt_error;
- }
-
-- if (zend_isnan(fp_num)) {
-+ if (std::isnan(fp_num)) {
- s = "NAN";
- s_len = 3;
- break;
-- } else if (zend_isinf(fp_num)) {
-+ } else if (std::isinf(fp_num)) {
- if (fp_num > 0) {
- s = "INF";
- s_len = 3;
More information about the arch-commits
mailing list