development/hhvm: Updated for version 4.56.1

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
This commit is contained in:
Eugen Wissner 2020-10-27 14:52:11 +01:00 committed by Willy Sudiarto Raharjo
parent 77165e2f61
commit 9c1bd1420a
No known key found for this signature in database
GPG Key ID: 3F617144D7238786
4 changed files with 78 additions and 14 deletions

View File

@ -0,0 +1,25 @@
From 58528a9e983ae8ba53e4e5c10f0565ac0b12c2b3 Mon Sep 17 00:00:00 2001
From: Eugen Wissner <belka@caraus.de>
Date: Sun, 25 Oct 2020 10:18:08 +0100
Subject: [PATCH] Link static libiberty
---
hphp/hhvm/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hphp/hhvm/CMakeLists.txt b/hphp/hhvm/CMakeLists.txt
index f70bd1f542..ab41ec1e5d 100644
--- a/hphp/hhvm/CMakeLists.txt
+++ b/hphp/hhvm/CMakeLists.txt
@@ -28,7 +28,7 @@ endif()
get_object_libraries_objects(additionalObjects ${HHVM_WHOLE_ARCHIVE_LIBRARIES})
add_executable(hhvm ${CXX_SOURCES} ${additionalObjects})
-target_link_libraries(hhvm ${HHVM_LINK_LIBRARIES} ${EZC_LINK_LIBRARIES} ${HRE_LINK_LIBRARIES})
+target_link_libraries(hhvm /usr/lib64/libiberty.a ${HHVM_LINK_LIBRARIES} ${EZC_LINK_LIBRARIES} ${HRE_LINK_LIBRARIES})
link_object_libraries(hhvm ${HHVM_WHOLE_ARCHIVE_LIBRARIES})
if (GOLD_FOUND AND ENABLE_LD_GOLD)
if (CMAKE_CONFIGURATION_TYPES)
--
2.17.5

View File

@ -45,7 +45,7 @@ See https://docs.hhvm.com/hhvm/advanced-usage/fastCGI.
To start a project you have to configure the type checker as well.
See the official documentation:
http://docs.hhvm.com/manual/en/install.hack.bootstrapping.php
https://docs.hhvm.com/hack/getting-started/getting-started
Basically you create an empty .hhconfig file in the root dir of your
project:

View File

@ -2,7 +2,7 @@
# Slackware build script for HHVM
# Copyright 2015-2018 Eugene Wissner, Dachau, Germany
# Copyright 2015-2020 Eugene Wissner, Dachau, Germany
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@ -23,10 +23,13 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=hhvm
VERSION=${VERSION:-4.32.0}
VERSION=${VERSION:-4.56.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
OPAM_STAMP="6ef290f5"
CARGO_STAMP="1ecc6299db9ec823"
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
i?86) ARCH=i586 ;;
@ -57,6 +60,10 @@ rm -rf $PRGNAM-$VERSION
tar Jxvf $CWD/$PRGNAM-$VERSION.tar.xz
cd $PRGNAM-$VERSION
mkdir -p hphp/hack/_build/opam hphp/hack/facebook
tar Jxvf $CWD/hack-switch-$OPAM_STAMP.tar.xz -C hphp/hack/_build/opam
tar Jxvf $CWD/cargo-home-$CARGO_STAMP.tar.xz -C hphp/hack
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@ -64,14 +71,31 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
cp $CWD/opam-full-2.0.3.tar.gz third-party/ocaml/
install -m 0644 -D $CWD/rust-1.43.0-x86_64-unknown-linux-gnu.tar.gz \
third-party/rustc/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/libzip-1.6.1.tar.gz third-party/libzip/libzipBuild-prefix/src/libzip-1.6.1.tar.gz
cat << EOF > hphp/hack/facebook/fetch_opam2_repo_hack.sh
#!/bin/sh
echo $CWD/index-$OPAM_STAMP
EOF
chmod 0755 hphp/hack/facebook/fetch_opam2_repo_hack.sh
patch -p1 -i $CWD/0001-Link-static-libiberty.patch
export CMAKE_PREFIX_PATH=`pwd`
cmake \
-DCMAKE_C_FLAGS:STRING="$SLKCFLAGS -lncursesw" \
-DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -lncursesw -I/usr/kerberos/include" \
-DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -lncursesw -I/usr/kerberos/include -I/usr/include/libiberty" \
-DCMAKE_CXX_STANDARD=14 \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} \
-DENABLE_MCROUTER=true \
-DENABLE_MCROUTER=false \
-DNON_DISTRIBUTABLE_BUILD=true \
-DENABLE_LD_GOLD=true \
-DUSE_JEMALLOC=false \
-DMYSQL_UNIX_SOCK_ADDR=/var/run/mysqld/mysqld.sock \
-DCMAKE_BUILD_TYPE=Release .
make
@ -84,10 +108,11 @@ mkdir -p $PKG/usr/man
mv hphp/doc/man $PKG/usr/man/man1
find $PKG/usr/man -type f -exec gzip -9 {} \;
mkdir -p $PKG/etc/{rc.d,hhvm} $PKG/usr/lib64/hhvm/extensions
install -m 644 $CWD/etc/rc.hhvm $PKG/etc/rc.d/rc.hhvm.new
install -m 644 $CWD/etc/server.ini $PKG/etc/hhvm/server.ini.new
install -m 644 $CWD/etc/php.ini $PKG/etc/hhvm/php.ini.new
install -m 644 -D $CWD/etc/rc.hhvm $PKG/etc/rc.d/rc.hhvm.new
install -m 644 -D $CWD/etc/server.ini $PKG/etc/hhvm/server.ini.new
install -m 644 -D $CWD/etc/php.ini $PKG/etc/hhvm/php.ini.new
mkdir -p $PKG/var/log/hhvm $PKG/usr/lib64/hhvm/extensions
# PID
mkdir -p $PKG/var/run/hhvm

View File

@ -1,10 +1,24 @@
PRGNAM="hhvm"
VERSION="4.32.0"
VERSION="4.56.1"
HOMEPAGE="https://hhvm.com/"
DOWNLOAD="UNSUPPORTED"
MD5SUM=""
DOWNLOAD_x86_64="https://download.dlackware.com/hosted-sources/hhvm/hhvm-4.32.0.tar.xz"
MD5SUM_x86_64="f41841ae14c4629cec887e453bfcdcef"
REQUIRES="tbb glog dwarf oniguruma libmemcached krb5 lz4 libsodium"
DOWNLOAD_x86_64="https://download.dlackware.com/hosted-sources/hhvm/hhvm-4.56.1.tar.xz \
https://static.rust-lang.org/dist/rust-1.43.0-x86_64-unknown-linux-gnu.tar.gz \
https://download.dlackware.com/hosted-sources/hhvm/opam-full-2.0.3.tar.gz \
https://download.dlackware.com/hosted-sources/hhvm/libzip-1.6.1.tar.gz \
https://download.dlackware.com/hosted-sources/hhvm/fmt-6.1.2.zip \
https://download.dlackware.com/hosted-sources/hhvm/cargo-home-1ecc6299db9ec823.tar.xz \
https://download.dlackware.com/hosted-sources/hhvm/index-6ef290f5.tar.gz \
https://download.dlackware.com/hosted-sources/hhvm/hack-switch-6ef290f5.tar.xz"
MD5SUM_x86_64="edc4cf258e49b2311418f3cc651e6782 \
c1cb2b3d0c9edb4b61b01ba6b090d01b \
d685758ad289672ee43caa4baa20b849 \
43883accb207d977462aed9fed40b30b \
5ec643b082a34254ad07136e7cbd4220 \
990b311a2863c88e372051291a9f7f02 \
1f67209970361d31d2b60812af78b540 \
ddff31c5f0baa6b0ebc3b04e67d04306"
REQUIRES="tbb glog libdwarf oniguruma libmemcached krb5 libsodium"
MAINTAINER="Eugene Wissner"
EMAIL="belka@caraus.de"