diff --git a/dev-lang/php/patches/php8-8.1.9.patchset b/dev-lang/php/patches/php8-8.1.9.patchset deleted file mode 100644 index bdd769f8a..000000000 --- a/dev-lang/php/patches/php8-8.1.9.patchset +++ /dev/null @@ -1,130 +0,0 @@ -From d73a3549a568d1eb8d58b46e5f4251179d2fa7aa 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 - - -diff --git a/ext/bz2/config.m4 b/ext/bz2/config.m4 -index 56d81a6..1595cac 100644 ---- a/ext/bz2/config.m4 -+++ b/ext/bz2/config.m4 -@@ -6,6 +6,8 @@ PHP_ARG_WITH([bz2], - if test "$PHP_BZ2" != "no"; then - if test -r $PHP_BZ2/include/bzlib.h; then - BZIP_DIR=$PHP_BZ2 -+ elif test -r $PHP_BZ2/develop/headers/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 536785f..8545219 100644 ---- a/ext/gettext/config.m4 -+++ b/ext/gettext/config.m4 -@@ -8,6 +8,10 @@ if test "$PHP_GETTEXT" != "no"; then - test -r $i/include/libintl.h && GETTEXT_DIR=$i && break - done - -+ for i in $PHP_GETTEXT; do -+ test -r $i/develop/headers/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 209f92b..3855c8d 100644 ---- a/ext/readline/config.m4 -+++ b/ext/readline/config.m4 -@@ -19,6 +19,10 @@ if test "$PHP_READLINE" && test "$PHP_READLINE" != "no"; then - test -f $i/include/readline/readline.h && READLINE_DIR=$i && break - done - -+ for i in $PHP_READLINE; do -+ test -f $i/develop/headers/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.36.1 - - -From efedb861425148922cce3abd6b297eb6212edfad 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 - - -diff --git a/ext/pcntl/pcntl.c b/ext/pcntl/pcntl.c -index 06db55f..8a33043 100644 ---- a/ext/pcntl/pcntl.c -+++ b/ext/pcntl/pcntl.c -@@ -50,6 +50,10 @@ - # define NSIG 32 - #endif - -+#ifndef SIGIO -+# define SIGIO -1 -+#endif -+ - ZEND_DECLARE_MODULE_GLOBALS(pcntl) - static PHP_GINIT_FUNCTION(pcntl); - --- -2.36.1 - - -From f2d213692626462617d2619831b3a3952ae2fe93 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.36.1 - diff --git a/dev-lang/php/patches/php8-8.4.4.patchset b/dev-lang/php/patches/php8-8.4.4.patchset new file mode 100644 index 000000000..172d9ed27 --- /dev/null +++ b/dev-lang/php/patches/php8-8.4.4.patchset @@ -0,0 +1,52 @@ +From b32597178779a485e24936d4738d07658785dfdb 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 + +included 32bit fixes + +diff --git a/ext/bz2/config.m4 b/ext/bz2/config.m4 +index 89efb26..7fe9847 100644 +--- a/ext/bz2/config.m4 ++++ b/ext/bz2/config.m4 +@@ -10,6 +10,18 @@ if test "$PHP_BZ2" != "no"; then + done + ]) + ++ AS_IF([test -r $PHP_BZ2/develop/headers/bzlib.h], [BZIP_DIR=$PHP_BZ2], [ ++ for i in /boot/system /system; do ++ AS_IF([test -r $i/develop/headers/bzlib.h], [BZIP_DIR=$i; break;]) ++ done ++ ]) ++ ++ AS_IF([test -r $PHP_BZ2/develop/headers/$(getarch)/bzlib.h], [BZIP_DIR=$PHP_BZ2], [ ++ for i in /boot/system /system; do ++ AS_IF([test -r $i/develop/headers/$(getarch)/bzlib.h], [BZIP_DIR=$i; break;]) ++ done ++ ]) ++ + AC_MSG_CHECKING([for BZip2]) + AS_VAR_IF([BZIP_DIR],, [ + AC_MSG_RESULT([bzlib.h not found]) +diff --git a/ext/gettext/config.m4 b/ext/gettext/config.m4 +index ae3eaf3..c36e1ca 100644 +--- a/ext/gettext/config.m4 ++++ b/ext/gettext/config.m4 +@@ -8,6 +8,14 @@ if test "$PHP_GETTEXT" != "no"; then + AS_IF([test -r $i/include/libintl.h], [GETTEXT_DIR=$i; break;]) + done + ++ for i in $PHP_GETTEXT /boot/system /system; do ++ AS_IF([test -r $i/develop/headers/libintl.h], [GETTEXT_DIR=$i; break;]) ++ done ++ ++ for i in $PHP_GETTEXT /boot/system /system; do ++ AS_IF([test -r $i/develop/headers/$(getarch)/libintl.h], [GETTEXT_DIR=$i; break;]) ++ done ++ + AS_VAR_IF([GETTEXT_DIR],, + [AC_MSG_ERROR([Cannot locate header file libintl.h])]) + +-- +2.45.2 + diff --git a/dev-lang/php/php8-8.1.9.recipe b/dev-lang/php/php8-8.4.4.recipe similarity index 88% rename from dev-lang/php/php8-8.1.9.recipe rename to dev-lang/php/php8-8.4.4.recipe index c5dc7997e..ecf53133d 100644 --- a/dev-lang/php/php8-8.1.9.recipe +++ b/dev-lang/php/php8-8.4.4.recipe @@ -6,9 +6,9 @@ popular websites in the world." HOMEPAGE="https://php.net/" COPYRIGHT="2001-2022 PHP Group" LICENSE="PHP License v3.01" -REVISION="6" +REVISION="1" SOURCE_URI="https://php.net/get/php-$portVersion.tar.bz2/from/this/mirror" -CHECKSUM_SHA256="9ebb0e2e571db6fd5930428dcb2d19ed3e050338ec1f1347c282cae92fc086ff" +CHECKSUM_SHA256="192a325fd3ca09b6c528dd6014ee07d803c3162514d4bb0d3e0981d00ac700ec" SOURCE_FILENAME="php-$portVersion.tar.bz2" SOURCE_DIR="php-$portVersion" PATCHES="php8-$portVersion.patchset" @@ -47,8 +47,8 @@ REQUIRES=" lib:libbz2$secondaryArchSuffix lib:libcrypto$secondaryArchSuffix lib:libcurl$secondaryArchSuffix + lib:libedit$secondaryArchSuffix lib:libfreetype$secondaryArchSuffix - lib:libgettextpo$secondaryArchSuffix lib:libgd$secondaryArchSuffix lib:libicuuc$secondaryArchSuffix lib:libintl$secondaryArchSuffix @@ -57,7 +57,6 @@ REQUIRES=" lib:libonig$secondaryArchSuffix lib:libpcre2_8$secondaryArchSuffix lib:libpng16$secondaryArchSuffix - lib:libreadline$secondaryArchSuffix lib:libsqlite3$secondaryArchSuffix lib:libssl$secondaryArchSuffix lib:libwebp$secondaryArchSuffix @@ -74,8 +73,8 @@ BUILD_REQUIRES=" devel:libbz2$secondaryArchSuffix devel:libcrypto$secondaryArchSuffix >= 3 devel:libcurl$secondaryArchSuffix + devel:libedit$secondaryArchSuffix devel:libfreetype$secondaryArchSuffix - devel:libgettextlib$secondaryArchSuffix devel:libgd$secondaryArchSuffix devel:libicuuc$secondaryArchSuffix >= 74 devel:libintl$secondaryArchSuffix @@ -85,7 +84,6 @@ BUILD_REQUIRES=" devel:libpcre2_8$secondaryArchSuffix devel:libpng16$secondaryArchSuffix devel:libpq$secondaryArchSuffix - devel:libreadline$secondaryArchSuffix >= 8 devel:libsqlite3$secondaryArchSuffix devel:libssl$secondaryArchSuffix >= 3 devel:libwebp$secondaryArchSuffix @@ -115,33 +113,34 @@ BUILD() --sysconfdir=$settingsDir/php8 \ --with-config-file-path=$settingsDir/php8 \ --with-config-file-scan-dir=$settingsDir/php8 \ - --with-zip \ - --with-zlib-dir=`finddir B_SYSTEM_DIRECTORY` --with-zlib \ - --with-bz2=`finddir B_SYSTEM_DIRECTORY` \ - --with-readline=`finddir B_SYSTEM_DIRECTORY` \ - --with-openssl \ - --with-curl \ + --disable-debug \ --disable-opcache \ - --enable-intl \ - --with-gettext=`finddir B_SYSTEM_DIRECTORY` \ - --enable-ftp \ - --enable-soap \ - --without-iconv \ - --enable-fpm \ - --enable-gd \ - --with-external-gd \ - --with-mysqli \ --enable-bcmath \ - --enable-mbstring \ - --with-freetype \ - --with-jpeg \ - --with-webp \ - --with-external-pcre \ - --enable-exif \ --enable-calendar \ + --enable-exif \ + --enable-fpm \ + --enable-ftp \ + --enable-gd \ + --enable-intl \ + --enable-mbstring \ --enable-pcntl \ + --enable-soap \ --enable-sockets \ - --disable-debug + --with-bz2 \ + --with-curl \ + --with-external-gd \ + --with-external-pcre \ + --with-freetype \ + --with-gettext \ + --with-jpeg \ + --with-libedit \ + --with-mysqli \ + --with-openssl \ + --with-webp \ + --with-zip \ + --with-zlib \ + --without-iconv + make $jobArgs }