fix build on e2k

This commit is contained in:
dzou 2022-04-06 18:32:03 +03:00
parent 596e3647a5
commit 96e547b20d
2 changed files with 19 additions and 1 deletions

12
add-include.patch Normal file
View file

@ -0,0 +1,12 @@
diff --git a/ext/opcache/zend_accelerator_util_funcs.c b/ext/opcache/zend_accelerator_util_funcs.c
index 53efa865..d6975a44 100644
--- a/ext/opcache/zend_accelerator_util_funcs.c
+++ b/ext/opcache/zend_accelerator_util_funcs.c
@@ -24,6 +24,7 @@
#include "zend_accelerator_util_funcs.h"
#include "zend_persist.h"
#include "zend_shared_alloc.h"
+#include <immintrin.h>
#if SIZEOF_SIZE_T <= SIZEOF_ZEND_LONG
/* If sizeof(void*) == sizeof(zend_ulong) we can use zend_hash index functions */

View file

@ -81,6 +81,8 @@ Patch114: php-no_pam_in_c-client.diff
# Fix bugs
Patch121: php-bug43221.diff
Patch122: php-not-use-libgd-const.patch
# fix include
Patch123: add-include.patch
BuildRequires: autoconf
BuildRequires: automake
@ -1271,6 +1273,7 @@ fi
# upstream fixes
%patch121 -p0 -b .bug43221.droplet
%patch122 -p1
%patch123 -p1
cp %{SOURCE2} maxlifetime
cp %{SOURCE3} php.crond
@ -1334,6 +1337,7 @@ libtoolize --force
aclocal
%build
%config_update
%serverbuild
cp -f %{_datadir}/libtool/build-aux/config.* .
@ -1377,9 +1381,11 @@ export GD_SHARED_LIBADD="$GD_SHARED_LIBADD -lm"
# -fuse-ld=gold is a workaround for a very weird bug showing with lld 9.0.1
# and php 7.4.1: "cannot apply additional memory protection after relocation"
# Check if we can get rid of this after lld 10 is released.
%ifarch %{x86_64} %{ix86} %{armx}
SAFE_LDFLAGS=`echo %{ldflags} -fuse-ld=gold|sed -e 's|-Wl,--no-undefined||g'`
export EXTRA_LIBS="-lz"
export LDFLAGS="$SAFE_LDFLAGS"
%endif
export EXTRA_LIBS="-lz"
# never use "--disable-rpath", it does the opposite