summaryrefslogtreecommitdiffstats
path: root/php-7.4.0-ldap_r.patch
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2023-06-05 15:41:53 +0200
committerRemi Collet <remi@php.net>2023-06-05 15:41:53 +0200
commitce6bb895e772b36d61237c635770e4c2ee51f766 (patch)
tree551551a05c55c5aa63dcf29050000706173f4ba6 /php-7.4.0-ldap_r.patch
duplicate 8.2
Diffstat (limited to 'php-7.4.0-ldap_r.patch')
-rw-r--r--php-7.4.0-ldap_r.patch19
1 files changed, 19 insertions, 0 deletions
diff --git a/php-7.4.0-ldap_r.patch b/php-7.4.0-ldap_r.patch
new file mode 100644
index 0000000..13566b4
--- /dev/null
+++ b/php-7.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
+@@ -68,7 +68,11 @@ if test "$PHP_LDAP" != "no"; then
+ 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)
+