[php-src] master: Merge branch 'PHP-8.2' into PHP-8.3
| From: | Peter Kokot | Date: | Mon, 18 Mar 2024 11:13:47 +0000 |
| Subject: | [php-src] master: Merge branch 'PHP-8.2' into PHP-8.3 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-127774@lists.php.net to get a copy of this message | ||
Author: Peter Kokot (petk)
Date: 2024-03-18T11:58:56+01:00
Commit: https://github.com/php/php-src/commit/f66696548bb1040bcdd05c89012de356383bb29e
Raw diff: https://github.com/php/php-src/commit/f66696548bb1040bcdd05c89012de356383bb29e.diff
Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
Fix GH-12019: ext/gd/config.m4: don't forget GDLIB_CFLAGS in feature tests
Changed paths:
M NEWS
M ext/gd/config.m4
Diff:
diff --git a/NEWS b/NEWS
index bf3f4f1984bd4..cb573df6587ad 100644
--- a/NEWS
+++ b/NEWS
@@ -16,6 +16,9 @@ PHP NEWS
. Fixed GH-11086 (FPM: config test runs twice in daemonised mode).
(Jakub Zelenka)
+- GD:
+ . Fixed bug GH-12019 (add GDLIB_CFLAGS in feature tests). (Michael Orlitzky)
+
- Gettext:
. Fixed sigabrt raised with dcgettext/dcngettext calls with gettext 0.22.5
with category set to LC_ALL. (David Carlier)
diff --git a/ext/gd/config.m4 b/ext/gd/config.m4
index 6ca36fae1dcee..b31c9b2c0bdf7 100644
--- a/ext/gd/config.m4
+++ b/ext/gd/config.m4
@@ -150,6 +150,8 @@ dnl or run test insufficient.
AC_DEFUN([PHP_GD_CHECK_FORMAT],[
old_LIBS="${LIBS}"
LIBS="${LIBS} ${GD_SHARED_LIBADD}"
+ old_CFLAGS="${CFLAGS}"
+ CFLAGS="${CFLAGS} ${GDLIB_CFLAGS}"
AC_MSG_CHECKING([for working gdImageCreateFrom$1 in libgd])
AC_LANG_PUSH([C])
AC_RUN_IFELSE([AC_LANG_SOURCE([
@@ -180,6 +182,7 @@ int main(int argc, char** argv) {
AC_MSG_RESULT([no])
])
AC_LANG_POP([C])
+ CFLAGS="${old_CFLAGS}"
LIBS="${old_LIBS}"
])