summaryrefslogtreecommitdiffstats
path: root/php-7.1.15-ldap_r.patch
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2018-02-14 12:52:11 +0100
committerRemi Collet <remi@remirepo.net>2018-02-14 12:52:11 +0100
commit4f51b3559ab78393cf70aff98f42955a1d8313e3 (patch)
tree30f84af984f2e3e40e67019779f87192f114ec2b /php-7.1.15-ldap_r.patch
parenteb301cec62f740f26f16c41df037c6bd30a1521d (diff)
Update to 7.1.15RC1
adapt ldap patch
Diffstat (limited to 'php-7.1.15-ldap_r.patch')
-rw-r--r--php-7.1.15-ldap_r.patch19
1 files changed, 19 insertions, 0 deletions
diff --git a/php-7.1.15-ldap_r.patch b/php-7.1.15-ldap_r.patch
new file mode 100644
index 0000000..ab65a14
--- /dev/null
+++ b/php-7.1.15-ldap_r.patch
@@ -0,0 +1,19 @@
+
+Use -lldap_r by default.
+
+diff -up php-7.1.15RC1/ext/ldap/config.m4.ldap_r php-7.1.15RC1/ext/ldap/config.m4
+--- php-7.1.15RC1/ext/ldap/config.m4.ldap_r 2018-02-14 07:28:23.608321317 +0100
++++ php-7.1.15RC1/ext/ldap/config.m4 2018-02-14 07:28:58.527492025 +0100
+@@ -119,7 +119,11 @@ if test "$PHP_LDAP" != "no"; then
+
+ MACHINE_INCLUDES=$($CC -dumpmachine)
+
+- 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)
+