development/hhvm: Updated for version 4.153.1

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

1 files changed, 100 insertions, 33 deletions

diff --git a/development/hhvm/hhvm.SlackBuild b/development/hhvm/hhvm.SlackBuild
index cbaa474322..8075136a61 100644
--- a/development/hhvm/hhvm.SlackBuild
+++ b/development/hhvm/hhvm.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for HHVM
 
-# Copyright 2015-2021 Eugene Wissner, Dachau, Germany
+# Copyright 2015-2022 Eugene Wissner, Dachau, Germany
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,13 +25,13 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=hhvm
-VERSION=${VERSION:-4.104.1}
+VERSION=${VERSION:-4.153.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
-OPAM_STAMP="221708b"
-CARGO_BUILD="1"
+OPAM_STAMP="12fbd9f"
+CARGO_BUILD="2"
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -70,34 +70,99 @@ rm -rf $PRGNAM-$VERSION
 tar Jxvf $CWD/$PRGNAM-$VERSION.tar.xz
 cd $PRGNAM-$VERSION
 
-mkdir -p hphp/hack/facebook third-party/brotli/bundled_brotli-prefix/src
-
-mkdir -p hphp/hack/_build/opam
+mkdir -p hphp/hack/facebook hphp/hack/_build/opam
 tar Jxvf $CWD/hack-switch-$OPAM_STAMP.tar.xz -C hphp/hack/_build/opam
-# hhvm prepares an opam switch (an isolated envrionment with a specific OCaml
-# compiler version) during the build, it downloads and builds all dependencies.
-# To avoid doing this at runtime, I provide a prebuilt switch. Unfortunately
-# it contains references to absolute paths it has been built in. Therefore if
-# the user doesn't build in the standard directory, we put a link there, so
-# that opam can find binaries.
-if [ "$TMP" != '/tmp/SBo' ]
-then
-  rm -rf /tmp/SBo/hhvm-$VERSION/hphp/hack/_build/opam
-  mkdir -p /tmp/SBo/hhvm-$VERSION/hphp/hack/_build/opam
-  ln -s $TMP/$PRGNAM-$VERSION/hphp/hack/_build/opam/hack-switch \
-    /tmp/SBo/hhvm-$VERSION/hphp/hack/_build/opam/hack-switch
-fi
-
-tar Jxvf $CWD/cargo-home-$CARGO_BUILD.tar.xz -C hphp/hack
-tar Jxvf $CWD/brotli-4b5771be.tar.xz -C third-party/brotli/bundled_brotli-prefix/src
-
-install -m 0755 -D $CWD/opam-2.0.7-x86_64-linux \
-  third-party/opam/opamDownload-prefix/src/opam-2.0.7-x86_64-linux
-install -m 0644 -D $CWD/rust-1.43.0-x86_64-unknown-linux-gnu.tar.gz \
-  third-party/rustc/bundled_rust-prefix/src/rust-1.43.0-x86_64-unknown-linux-gnu.tar.gz
-install -m 0644 -D $CWD/fmt-6.1.2.zip third-party/fmt/fmt-prefix/src/fmt-6.1.2.zip
-install -m 0644 -D $CWD/fb-prod8-202010.tar.gz \
-  third-party/fb-mysql/bundled_fbmysqlclient-prefix/src/fb-prod8-202010.tar.gz
+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
+
+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
+tar zxvf $CWD/re2-2021-11-01.tar.gz \
+  -C third-party/re2/bundled_re2-prefix/src/bundled_re2 \
+  --strip-components=1
+
+mkdir -p third-party/brotli/bundled_brotli-prefix/src/bundled_brotli
+install -m 0644 -D $CWD/brotli-v1.0.9.tar.gz third-party/brotli/bundled_brotli-prefix/src/brotli-v1.0.9.tar.gz
+tar zxvf $CWD/brotli-v1.0.9.tar.gz \
+  -C third-party/brotli/bundled_brotli-prefix/src/bundled_brotli \
+  --strip-components=1
+
+mkdir -p third-party/rustc/bundled_rust-prefix/src/bundled_rust
+install -m 0644 -D $CWD/rustc-2021-11-29-rust-nightly-x86_64-unknown-linux-gnu.tar.gz \
+  third-party/rustc/bundled_rust-prefix/src/rustc-2021-11-29-rust-nightly-x86_64-unknown-linux-gnu.tar.gz
+tar zxvf $CWD/rustc-2021-11-29-rust-nightly-x86_64-unknown-linux-gnu.tar.gz \
+  -C third-party/rustc/bundled_rust-prefix/src/bundled_rust \
+  --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 \
+  -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 \
+  -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 \
+  -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 \
+  -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 \
+  -C third-party/mcrouter/bundled_mcrouter-prefix/src/bundled_mcrouter \
+  --strip-components=1
+
+mkdir -p third-party/timelib/bundled_timelib-prefix/src/bundled_timelib
+install -m 0644 -D $CWD/timelib-2021.07.tar.gz third-party/timelib/bundled_timelib-prefix/src/timelib-2021.07.tar.gz
+tar -zxvf $CWD/timelib-2021.07.tar.gz \
+  -C third-party/timelib/bundled_timelib-prefix/src/bundled_timelib \
+  --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 \
+  -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
@@ -107,7 +172,8 @@ echo facebook/index-$OPAM_STAMP
 EOF
 chmod 0755 hphp/hack/facebook/fetch_opam2_repo_hack.sh
 
-patch -p1 --verbose -i $CWD/0001-Link-static-libiberty.patch
+patch -p1 --verbose -i $CWD/patches/0001-liburing.patch
+patch -p1 --verbose -i $CWD/patches/0002-download.patch
 
 chown -R root:root .
 find -L . \
@@ -123,11 +189,12 @@ cmake \
   -DCMAKE_CXX_STANDARD=17 \
   -DCMAKE_INSTALL_PREFIX=/usr \
   -DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} \
-  -DENABLE_MCROUTER=false \
+  -DENABLE_MCROUTER=true \
   -DENABLE_EXTENSION_IMAGICK=false \
   -DNON_DISTRIBUTABLE_BUILD=true \
   -DENABLE_LD_GOLD=true \
   -DUSE_JEMALLOC=true \
+  -DUSE_BUNDLED_TZDATA=OFF \
   -DFORCE_BUNDLED_LZ4=OFF \
   -DMYSQL_UNIX_SOCK_ADDR=/var/run/mysqld/mysqld.sock \
   -DCMAKE_BUILD_TYPE=Release .