[arch-commits] Commit in hhvm/trunk (PKGBUILD)

[Massimiliano Torromeo]

    Date: Friday, August 19, 2016 @ 16:06:12
  Author: mtorromeo
Revision: 187068

boost 1.61 rebuild

Modified:
  hhvm/trunk/PKGBUILD

----------+
 PKGBUILD |   17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-08-19 15:45:32 UTC (rev 187067)
+++ PKGBUILD	2016-08-19 16:06:12 UTC (rev 187068)
@@ -4,7 +4,7 @@
 
 pkgname=hhvm
 pkgver=3.14.4
-pkgrel=2
+pkgrel=3
 
 _thirdparty_commit=e1fcf90c07e0af00906f98cde8aa828bec7b2e01
 _brotli_commit=98ed7a23a83d64133b0a36a884e489bffb0eb864
@@ -24,8 +24,8 @@
          'libxslt' 'intel-tbb' 'libmcrypt' 'oniguruma' 'jemalloc' 'curl'
          'libvpx' 'libdwarf' 'imagemagick' 'libedit' 'sqlite' 'libyaml'
          'fribidi' 're2' 'gperf' 'c-client' 'unixodbc' 'numactl')
-makedepends=('git' 'mercurial' 'cmake' 'gcc' 'boost' 'gflags' 'python2'
-             'pfff' 'ragel' 'libmariadbclient')
+makedepends=('git' 'mercurial' 'cmake' 'gcc' 'boost'
+             'gflags' 'pfff' 'ragel' 'libmariadbclient' 'python2')
 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"
@@ -40,12 +40,18 @@
         'hhvm.service'
         'hhvm at .service'
         'php.ini'
-        'server.ini')
+        'server.ini'
+        "folly-fiber-remove.patch")
 install=hhvm.install
 backup=(etc/hhvm/{php,server}.ini)
 options+=('!buildflags')
 
 prepare() {
+    cd "$srcdir"/folly-$_folly_commit
+    # not yet compatible with boost 1.61
+    # https://github.com/facebook/folly/issues/413
+    patch -p1 -i "$srcdir"/folly-fiber-remove.patch
+
     cd "$srcdir"/$pkgname-HHVM-$pkgver
 
     sed 's/TypedValue m_extraArgs\[\];/TypedValue m_extraArgs[0];/' \
@@ -154,4 +160,5 @@
             '8b50d1ef9f5f726e6d8d469a8c84d85ad63f8b507b97d258b4d751a0e3e221df'
             '59c640602929dac0aa34d06c668ed69361eb4b7b47a77f9aa0badb4d0b61571c'
             '3e3093f817706c238fad021483f114fd4ce0b45d84097dcb7870157fc9ec769f'
-            '5b53bc57965e1c5151d720dc7f63f1b2e8ebd5e758b2ef0be3b74df38ebcbce0')
+            '5b53bc57965e1c5151d720dc7f63f1b2e8ebd5e758b2ef0be3b74df38ebcbce0'
+            '447084b3536da0c30ac1d766c39282fae9a4518ade294c93afbb7cc44716899b')