diff options
| author | Remi Collet <remi@remirepo.net> | 2025-07-02 09:57:25 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2025-07-02 09:57:25 +0200 |
| commit | 833dba6c7ad156db24f8c6ef254e1547fabb0d35 (patch) | |
| tree | d2c27a6b7d0f0c6b966720882be74a4df3ed61d8 /0001-fix-ldap.h-detection-without-pkgconfig.patch | |
| parent | a6e73b4a3c3e95809743314c8ff0a163eaaf720c (diff) | |
update to 8.5.0alpha1
fix FPM test failure https://github.com/php/php-src/pull/18992
fix ldap.h dectection https://github.com/php/php-src/pull/19005
Diffstat (limited to '0001-fix-ldap.h-detection-without-pkgconfig.patch')
| -rw-r--r-- | 0001-fix-ldap.h-detection-without-pkgconfig.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/0001-fix-ldap.h-detection-without-pkgconfig.patch b/0001-fix-ldap.h-detection-without-pkgconfig.patch new file mode 100644 index 0000000..abe5c3d --- /dev/null +++ b/0001-fix-ldap.h-detection-without-pkgconfig.patch @@ -0,0 +1,41 @@ +From 85ed35c3561285ab6e1ea7f937e060a2352ef9d8 Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Wed, 2 Jul 2025 09:17:21 +0200 +Subject: [PATCH] fix ldap.h detection without pkgconfig + +--- + ext/ldap/config.m4 | 13 +++++++++---- + 1 file changed, 9 insertions(+), 4 deletions(-) + +diff --git a/ext/ldap/config.m4 b/ext/ldap/config.m4 +index 7d0229f6868..ae0ae7fba95 100644 +--- a/ext/ldap/config.m4 ++++ b/ext/ldap/config.m4 +@@ -60,15 +60,20 @@ if test "$PHP_LDAP" != "no"; then + [-DZEND_ENABLE_STATIC_TSRMLS_CACHE=1]) + + AS_VAR_IF([PHP_LDAP], [yes], [ +- PKG_CHECK_MODULES([LDAP], [lber ldap]) +- PHP_LDAP_PKGCONFIG=true +- ], [PHP_LDAP_CHECKS([$PHP_LDAP])]) ++ PKG_CHECK_MODULES([LDAP], [lber ldap], ++ PHP_LDAP_PKGCONFIG=true, PHP_LDAP_PKGCONFIG=false)]) + + AS_IF([test "$PHP_LDAP_PKGCONFIG" = true], [ + PHP_EVAL_INCLINE([$LDAP_CFLAGS]) + PHP_EVAL_LIBLINE([$LDAP_LIBS], [LDAP_SHARED_LIBADD]) + ], [ +- AS_VAR_IF([LDAP_DIR],, [AC_MSG_ERROR([Cannot find ldap.h])]) ++ AS_VAR_IF([PHP_LDAP], [yes], [ ++ for i in /usr/local /usr; do ++ PHP_LDAP_CHECKS([$i]) ++ done ++ ], [PHP_LDAP_CHECKS([$PHP_LDAP])]) ++ AC_MSG_CHECKING([for ldap.h]) ++ AS_VAR_IF([LDAP_DIR],, [AC_MSG_ERROR([Cannot find ldap.h])], AC_MSG_RESULT([$LDAP_DIR])) + + dnl -pc removal is a hack for clang + MACHINE_INCLUDES=$($CC -dumpmachine | $SED 's/-pc//') +-- +2.50.0 + |