Bernd Kuhls
aedf131da6
Release notes: https://www.php.net/releases/8.5/en.php https://news-web.php.net/php.announce/474 https://news-web.php.net/php.announce/475 https://news-web.php.net/php.announce/481 Rebased patches 0001-0003. Removed patch 0005 due to the configure check being non-fatal now: https://github.com/php/php-src/commit/e4078a6a70d5ad7896049bc19f3affe2fe806c24 opcache is not an optional dependency anymore: https://github.com/php/php-src/commit/7b4c14dc10167b65ce51371507d7b37b74252077 Signed-off-by: Bernd Kuhls <bernd@kuhls.net> Signed-off-by: Julien Olivain <ju.o@free.fr>
40 lines
1.4 KiB
Diff
40 lines
1.4 KiB
Diff
From 1357df0196806d5697b1f84497ef72aab5faa8a3 Mon Sep 17 00:00:00 2001
|
|
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
|
Date: Tue, 9 Aug 2016 11:50:49 +0200
|
|
Subject: [PATCH] iconv: tweak iconv detection
|
|
|
|
Tweak PHP_SETUP_ICONV from aclocal/build/php.m4 to not
|
|
PHP_ADD_INCLUDE $ICONV_DIR/include since the tests use
|
|
test instead of AC_TRY_LINK to find headers which is bad,
|
|
specially when adding /usr and /usr/local to the mix.
|
|
Do basically the same with ext/iconv/config.m4 by tweaking
|
|
PHP_ICONV_H_PATH which, again, uses test and absolute paths.
|
|
|
|
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
|
[Gustavo: convert to nice m4 instead of patching configure]
|
|
[Gustavo: update for 5.6.10]
|
|
Signed-off-by: Adam Duskett <aduskett@gmail.com>
|
|
[aduskett@gmail.com: Update for 8.0.7]
|
|
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
|
|
[Bernd: rebased for 8.5.2]
|
|
---
|
|
build/php.m4 | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/build/php.m4 b/build/php.m4
|
|
index 9586c490..8b3d47ed 100644
|
|
--- a/build/php.m4
|
|
+++ b/build/php.m4
|
|
@@ -1806,7 +1806,7 @@
|
|
php_brew_prefix=$($BREW --prefix 2> /dev/null)
|
|
fi
|
|
|
|
- for i in $PHP_ICONV $php_brew_prefix/opt/libiconv /usr/local /usr; do
|
|
+ for i in $PHP_ICONV $php_brew_prefix/opt/libiconv; do
|
|
if test -r $i/include/gnu-libiconv/iconv.h; then
|
|
ICONV_DIR=$i
|
|
ICONV_INCLUDE_DIR=$i/include/gnu-libiconv
|
|
--
|
|
2.31.1
|
|
|