summaryrefslogtreecommitdiffstats
path: root/php-8.4.0-ldap_r.patch
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2024-07-31 08:20:07 +0200
committerRemi Collet <remi@php.net>2024-07-31 08:20:07 +0200
commit2968e8a2440cf5ef1bafb4abefbab7c1be2513be (patch)
treed34e4f27451ca26573f0abb63db863f3bdf8bd5e /php-8.4.0-ldap_r.patch
parent3fadc52c1d1f1060b5b5075d0ccca52c90a6913b (diff)
Update to 8.4.0alpha3
fix build with libedit reverting a readline fix
Diffstat (limited to 'php-8.4.0-ldap_r.patch')
-rw-r--r--php-8.4.0-ldap_r.patch19
1 files changed, 19 insertions, 0 deletions
diff --git a/php-8.4.0-ldap_r.patch b/php-8.4.0-ldap_r.patch
new file mode 100644
index 0000000..ea27490
--- /dev/null
+++ b/php-8.4.0-ldap_r.patch
@@ -0,0 +1,19 @@
+
+Use -lldap_r by default.
+
+diff -up php-7.4.0RC2/ext/ldap/config.m4.ldap_r php-7.4.0RC2/ext/ldap/config.m4
+--- php-7.4.0RC2/ext/ldap/config.m4.ldap_r 2019-09-17 10:21:24.769200812 +0200
++++ php-7.4.0RC2/ext/ldap/config.m4 2019-09-17 10:21:30.658181771 +0200
+@@ -71,7 +71,11 @@
+ dnl -pc removal is a hack for clang
+ MACHINE_INCLUDES=$($CC -dumpmachine | $SED 's/-pc//')
+
+- if test -f $LDAP_LIBDIR/liblber.a || test -f $LDAP_LIBDIR/liblber.$SHLIB_SUFFIX_NAME || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/liblber.a || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/liblber.$SHLIB_SUFFIX_NAME; then
++ if test -f $LDAP_LIBDIR/libldap_r.$SHLIB_SUFFIX_NAME; then
++ PHP_ADD_LIBRARY_WITH_PATH(lber, [$LDAP_LIBDIR], [LDAP_SHARED_LIBADD])
++ PHP_ADD_LIBRARY_WITH_PATH(ldap_r, [$LDAP_LIBDIR], [LDAP_SHARED_LIBADD])
++
++ elif test -f $LDAP_LIBDIR/liblber.a || test -f $LDAP_LIBDIR/liblber.$SHLIB_SUFFIX_NAME || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/liblber.a || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/liblber.$SHLIB_SUFFIX_NAME; then
+ PHP_ADD_LIBRARY_WITH_PATH([lber], [$LDAP_LIBDIR], [LDAP_SHARED_LIBADD])
+ PHP_ADD_LIBRARY_WITH_PATH([ldap], [$LDAP_LIBDIR], [LDAP_SHARED_LIBADD])
+