diff --git a/dev-lang/php/patches/php8-8.1.3.patchset b/dev-lang/php/patches/php8-8.1.3.patchset index 7816094ea..3fab6c04f 100644 --- a/dev-lang/php/patches/php8-8.1.3.patchset +++ b/dev-lang/php/patches/php8-8.1.3.patchset @@ -1,4 +1,4 @@ -From 17b139834747ae40fb5971b28f2a3fd9699a94aa Mon Sep 17 00:00:00 2001 +From d1fedfb7f6afb369a83fcba01325309ff6294726 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= Date: Sat, 19 Feb 2022 19:29:19 +0100 Subject: Teaching m4 about Haiku @@ -51,7 +51,7 @@ index 209f92b..3855c8d 100644 2.30.2 -From c776caa6e22d5e1530eacc04c1843152e2798c8e Mon Sep 17 00:00:00 2001 +From 1fa6a4748cdd9f5a2553c19aa6ec9478bc1cf0cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= Date: Sat, 19 Feb 2022 19:31:37 +0100 Subject: PCNTL build fix @@ -75,3 +75,56 @@ index c1c99ab..9fefeff 100644 -- 2.30.2 + +From c794c60abf23bfb42c5778568d29d7e48c8f5b35 Mon Sep 17 00:00:00 2001 +From: Victor Gamper +Date: Mon, 14 Mar 2022 22:40:30 +0000 +Subject: php8: fix 32-bit + + +diff --git a/ext/bz2/config.m4 b/ext/bz2/config.m4 +index 1595cac..7e398cd 100644 +--- a/ext/bz2/config.m4 ++++ b/ext/bz2/config.m4 +@@ -8,6 +8,8 @@ if test "$PHP_BZ2" != "no"; then + BZIP_DIR=$PHP_BZ2 + elif test -r $PHP_BZ2/develop/headers/bzlib.h; then + BZIP_DIR=$PHP_BZ2 ++ elif test -r $PHP_BZ2/develop/headers/$(getarch)/bzlib.h; then ++ BZIP_DIR=$PHP_BZ2 + else + AC_MSG_CHECKING(for BZip2 in default path) + for i in /usr/local /usr; do +diff --git a/ext/gettext/config.m4 b/ext/gettext/config.m4 +index 8545219..cad0216 100644 +--- a/ext/gettext/config.m4 ++++ b/ext/gettext/config.m4 +@@ -12,6 +12,10 @@ if test "$PHP_GETTEXT" != "no"; then + test -r $i/develop/headers/libintl.h && GETTEXT_DIR=$i && break + done + ++ for i in $PHP_GETTEXT; do ++ test -r $i/develop/headers/$(getarch)/libintl.h && GETTEXT_DIR=$i && break ++ done ++ + if test -z "$GETTEXT_DIR"; then + AC_MSG_ERROR(Cannot locate header file libintl.h) + fi +diff --git a/ext/readline/config.m4 b/ext/readline/config.m4 +index 3855c8d..e05393c 100644 +--- a/ext/readline/config.m4 ++++ b/ext/readline/config.m4 +@@ -23,6 +23,10 @@ if test "$PHP_READLINE" && test "$PHP_READLINE" != "no"; then + test -f $i/develop/headers/readline/readline.h && READLINE_DIR=$i && break + done + ++ for i in $PHP_READLINE; do ++ test -f $i/develop/headers/$(getarch)/readline/readline.h && READLINE_DIR=$i && break ++ done ++ + if test -z "$READLINE_DIR"; then + AC_MSG_ERROR(Please reinstall readline - I cannot find readline.h) + fi +-- +2.30.2 + diff --git a/dev-lang/php/php8-8.1.3.recipe b/dev-lang/php/php8-8.1.3.recipe index fb60394cc..9ab9c2a4d 100644 --- a/dev-lang/php/php8-8.1.3.recipe +++ b/dev-lang/php/php8-8.1.3.recipe @@ -15,7 +15,7 @@ PATCHES="php8-$portVersion.patchset" ADDITIONAL_FILES="userlaunch.in" ARCHITECTURES="all !x86_gcc2" -SECONDARY_ARCHITECTURES="!x86" +SECONDARY_ARCHITECTURES="x86" GLOBAL_WRITABLE_FILES=" settings/php8 directory keep-old