mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-09 05:10:05 +02:00
afeabff2a0
* php: Updated LICENSE * php: bump version * php: bump version * Delete php-7.4.16.patchset * Delete php8-8.1.3.patchset * Delete php-7.4.16.recipe * Delete php8-8.1.3.recipe * Update php8-8.1.9.recipe * Update php-7.4.30.recipe * Update php-7.4.30.recipe * Update php-7.4.30.recipe
131 lines
3.8 KiB
Plaintext
131 lines
3.8 KiB
Plaintext
From d73a3549a568d1eb8d58b46e5f4251179d2fa7aa Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
|
|
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?= <zmizsei@extrowerk.com>
|
|
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 <victor@wenzeslaus.de>
|
|
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
|
|
|