development/hhvm: Updated for version 4.168.2

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

1 files changed, 29 insertions, 46 deletions

diff --git a/development/hhvm/hhvm.SlackBuild b/development/hhvm/hhvm.SlackBuild
index fedb4f85acc7..fadc3c030f09 100644
--- a/development/hhvm/hhvm.SlackBuild
+++ b/development/hhvm/hhvm.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for HHVM
 
-# Copyright 2015-2022 Eugene Wissner, Dachau, Germany
+# Copyright 2015-2023 Eugene Wissner, Dachau, Germany
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,13 +25,14 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=hhvm
-VERSION=${VERSION:-4.153.4}
+VERSION=${VERSION:-4.168.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
-OPAM_STAMP="12fbd9f"
-CARGO_BUILD="2"
+OPAM_STAMP="1d2e919"
+CARGO_BUILD="3"
+FB_VERSION="2022.07.04.00"
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -77,9 +78,9 @@ tar Jxvf $CWD/cargo-home-$CARGO_BUILD.tar.xz -C hphp/hack/_build
 install -m 0755 -D $CWD/opam-2.1.0-x86_64-linux \
   third-party/opam/opamDownload-prefix/src/opam-2.1.0-x86_64-linux
 
-install -m 0644 -D $CWD/fmt-6.1.2.zip third-party/fmt/bundled_fmt-prefix/src/fmt-6.1.2.zip
-unzip $CWD/fmt-6.1.2.zip -d third-party/fmt/bundled_fmt-prefix/src
-mv third-party/fmt/bundled_fmt-prefix/src/fmt-6.1.2 third-party/fmt/bundled_fmt-prefix/src/bundled_fmt
+install -m 0644 -D $CWD/fmt-8.0.0.zip third-party/fmt/bundled_fmt-prefix/src/fmt-8.0.0.zip
+unzip $CWD/fmt-8.0.0.zip -d third-party/fmt/bundled_fmt-prefix/src
+mv third-party/fmt/bundled_fmt-prefix/src/fmt-8.0.0 third-party/fmt/bundled_fmt-prefix/src/bundled_fmt
 
 mkdir -p third-party/re2/bundled_re2-prefix/src/bundled_re2
 install -m 0644 -D $CWD/re2-2021-11-01.tar.gz third-party/re2/bundled_re2-prefix/src/re2-2021-11-01.tar.gz
@@ -101,54 +102,34 @@ tar zxvf $CWD/rust-nightly-x86_64-unknown-linux-gnu.tar.gz \
   --strip-components=1
 
 mkdir -p third-party/proxygen/bundled_proxygen-prefix/src/bundled_proxygen
-install -m 0644 -D $CWD/proxygen-v2022.01.31.00.tar.gz \
-  third-party/proxygen/bundled_proxygen-prefix/src/proxygen-v2022.01.31.00.tar.gz
-tar zxvf $CWD/proxygen-v2022.01.31.00.tar.gz \
+install -m 0644 -D $CWD/proxygen-v${FB_VERSION}.tar.gz \
+  third-party/proxygen/bundled_proxygen-prefix/src/proxygen-v${FB_VERSION}.tar.gz
+tar zxvf $CWD/proxygen-v${FB_VERSION}.tar.gz \
   -C third-party/proxygen/bundled_proxygen-prefix/src/bundled_proxygen
 
 mkdir -p third-party/folly/bundled_folly-prefix/src/bundled_folly
-install -m 0644 -D $CWD/folly-v2022.03.14.00.tar.gz \
-  third-party/folly/bundled_folly-prefix/src/folly-v2022.03.14.00.tar.gz
-tar zxvf $CWD/folly-v2022.03.14.00.tar.gz \
+install -m 0644 -D $CWD/folly-v${FB_VERSION}.tar.gz \
+  third-party/folly/bundled_folly-prefix/src/folly-v${FB_VERSION}.tar.gz
+tar zxvf $CWD/folly-v${FB_VERSION}.tar.gz \
   -C third-party/folly/bundled_folly-prefix/src/bundled_folly
 
-mkdir -p third-party/fb-mysql/bundled_fbmysqlclient-prefix/src/bundled_fbmysqlclient
-install -m 0644 -D $CWD/fb-prod8-202101.tar.gz \
-  third-party/fb-mysql/bundled_fbmysqlclient-prefix/src/fb-prod8-202101.tar.gz
-tar -zxvf $CWD/fb-prod8-202101.tar.gz \
-  -C third-party/fb-mysql/bundled_fbmysqlclient-prefix/src/bundled_fbmysqlclient
-
 mkdir -p third-party/wangle/bundled_wangle-prefix/src/bundled_wangle
-install -m 0644 -D $CWD/wangle-v2022.01.31.00.tar.gz \
-  third-party/wangle/bundled_wangle-prefix/src/wangle-v2022.01.31.00.tar.gz
-tar -zxvf $CWD/wangle-v2022.01.31.00.tar.gz \
+install -m 0644 -D $CWD/wangle-v${FB_VERSION}.tar.gz \
+  third-party/wangle/bundled_wangle-prefix/src/wangle-v${FB_VERSION}.tar.gz
+tar -zxvf $CWD/wangle-v${FB_VERSION}.tar.gz \
   -C third-party/wangle/bundled_wangle-prefix/src/bundled_wangle
 
-mkdir -p third-party/squangle/bundled_squangle-prefix/src/bundled_squangle
-install -m 0644 -D $CWD/squangle-v2022.01.31.00.tar.gz \
-  third-party/squangle/bundled_squangle-prefix/src/squangle-2022.01.31.00.tar.gz
-tar -zxvf $CWD/squangle-v2022.01.31.00.tar.gz \
-  -C third-party/squangle/bundled_squangle-prefix/src/bundled_squangle \
-  --strip-components=1
-
-mkdir -p third-party/watchman/bundled_watchman-prefix/src/bundled_watchman
-install -m 0644 -D $CWD/watchman-v2022.01.31.00.tar.gz \
-  third-party/watchman/bundled_watchman-prefix/src/watchman-v2022.01.31.00.tar.gz
-tar -zxvf $CWD/watchman-v2022.01.31.00.tar.gz \
-  -C third-party/watchman/bundled_watchman-prefix/src/bundled_watchman \
-  --strip-components=1
-
 mkdir -p third-party/thrift/bundled_thrift-prefix/src/bundled_thrift
-install -m 0644 -D $CWD/fbthrift-v2022.01.31.00.tar.gz \
-  third-party/thrift/bundled_thrift-prefix/src/fbthrift-v2022.01.31.00.tar.gz
-tar -zxvf $CWD/fbthrift-v2022.01.31.00.tar.gz \
+install -m 0644 -D $CWD/fbthrift-v${FB_VERSION}.tar.gz \
+  third-party/thrift/bundled_thrift-prefix/src/fbthrift-v${FB_VERSION}.tar.gz
+tar -zxvf $CWD/fbthrift-v${FB_VERSION}.tar.gz \
   -C third-party/thrift/bundled_thrift-prefix/src/bundled_thrift \
   --strip-components=1
 
 mkdir -p third-party/mcrouter/bundled_mcrouter-prefix/src/bundled_mcrouter
-install -m 0644 -D $CWD/mcrouter-v2022.01.31.00.tar.gz \
-  third-party/mcrouter/bundled_mcrouter-prefix/src/mcrouter-v2022.01.31.00.tar.gz
-tar -zxvf $CWD/mcrouter-v2022.01.31.00.tar.gz \
+install -m 0644 -D $CWD/mcrouter-v${FB_VERSION}.tar.gz \
+  third-party/mcrouter/bundled_mcrouter-prefix/src/mcrouter-v${FB_VERSION}.tar.gz
+tar -zxvf $CWD/mcrouter-v${FB_VERSION}.tar.gz \
   -C third-party/mcrouter/bundled_mcrouter-prefix/src/bundled_mcrouter \
   --strip-components=1
 
@@ -159,14 +140,14 @@ tar -zxvf $CWD/timelib-2021.07.tar.gz \
   --strip-components=1
 
 mkdir -p third-party/fizz/bundled_fizz-prefix/src/bundled_fizz
-install -m 0644 -D $CWD/fizz-v2022.01.31.00.tar.gz \
-  third-party/fizz/bundled_fizz-prefix/src/fizz-v2022.01.31.00.tar.gz
-tar -zxvf $CWD/fizz-v2022.01.31.00.tar.gz \
+install -m 0644 -D $CWD/fizz-v${FB_VERSION}.tar.gz \
+  third-party/fizz/bundled_fizz-prefix/src/fizz-v${FB_VERSION}.tar.gz
+tar -zxvf $CWD/fizz-v${FB_VERSION}.tar.gz \
   -C third-party/fizz/bundled_fizz-prefix/src/bundled_fizz
 
 # The working directory is hphp/hack.
 cat << EOF > hphp/hack/facebook/fetch_opam2_repo_hack.sh
-#!/bin/sh
+!/bin/sh
 cp $CWD/index-$OPAM_STAMP.tar.gz facebook/
 echo facebook/index-$OPAM_STAMP
 EOF
@@ -174,6 +155,7 @@ chmod 0755 hphp/hack/facebook/fetch_opam2_repo_hack.sh
 
 patch -p1 --verbose -i $CWD/patches/0001-liburing.patch
 patch -p1 --verbose -i $CWD/patches/0002-download.patch
+patch -p1 --verbose -i $CWD/patches/0003-iquote.patch
 
 chown -R root:root .
 find -L . \
@@ -196,6 +178,7 @@ cmake \
   -DUSE_JEMALLOC=true \
   -DUSE_BUNDLED_TZDATA=OFF \
   -DFORCE_BUNDLED_LZ4=OFF \
+  -DCAN_USE_SYSTEM_ZSTD=ON \
   -DMYSQL_UNIX_SOCK_ADDR=/var/run/mysqld/mysqld.sock \
   -DCMAKE_BUILD_TYPE=Release .
 make || make -j1