archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 22:18:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.2' into PHP-8.3

Browse source 
* PHP-8.2:
  Fix GH-12019: ext/gd/config.m4: don't forget GDLIB_CFLAGS in feature tests
This commit is contained in:
Peter Kokot 2024-03-18 11:58:56 +01:00
commit f66696548b
No known key found for this signature in database
GPG key ID: 56322FE83A7566FC
2 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
NEWS
View file

@ -16,6 +16,9 @@ PHP NEWS
. Fixed GH-11086 (FPM: config test runs twice in daemonised mode). . Fixed GH-11086 (FPM: config test runs twice in daemonised mode).
(Jakub Zelenka) (Jakub Zelenka)
- GD:
. Fixed bug GH-12019 (add GDLIB_CFLAGS in feature tests). (Michael Orlitzky)
- Gettext: - Gettext:
. Fixed sigabrt raised with dcgettext/dcngettext calls with gettext 0.22.5 . Fixed sigabrt raised with dcgettext/dcngettext calls with gettext 0.22.5
with category set to LC_ALL. (David Carlier) with category set to LC_ALL. (David Carlier)

3
ext/gd/config.m4
View file

@ -150,6 +150,8 @@ dnl or run test insufficient.
AC_DEFUN([PHP_GD_CHECK_FORMAT],[ AC_DEFUN([PHP_GD_CHECK_FORMAT],[
old_LIBS="${LIBS}" old_LIBS="${LIBS}"
LIBS="${LIBS} ${GD_SHARED_LIBADD}" LIBS="${LIBS} ${GD_SHARED_LIBADD}"
old_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} ${GDLIB_CFLAGS}"
AC_MSG_CHECKING([for working gdImageCreateFrom$1 in libgd]) AC_MSG_CHECKING([for working gdImageCreateFrom$1 in libgd])
AC_LANG_PUSH([C]) AC_LANG_PUSH([C])
AC_RUN_IFELSE([AC_LANG_SOURCE([ AC_RUN_IFELSE([AC_LANG_SOURCE([
@ -180,6 +182,7 @@ int main(int argc, char** argv) {
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
]) ])
AC_LANG_POP([C]) AC_LANG_POP([C])
CFLAGS="${old_CFLAGS}"
LIBS="${old_LIBS}" LIBS="${old_LIBS}"
]) ])