diff options
author | Remi Collet <remi@remirepo.net> | 2024-07-31 08:20:07 +0200 |
---|---|---|
committer | Remi Collet <remi@php.net> | 2024-07-31 08:20:07 +0200 |
commit | 2968e8a2440cf5ef1bafb4abefbab7c1be2513be (patch) | |
tree | d34e4f27451ca26573f0abb63db863f3bdf8bd5e /php-7.4.0-ldap_r.patch | |
parent | 3fadc52c1d1f1060b5b5075d0ccca52c90a6913b (diff) |
Update to 8.4.0alpha3
fix build with libedit reverting a readline fix
Diffstat (limited to 'php-7.4.0-ldap_r.patch')
-rw-r--r-- | php-7.4.0-ldap_r.patch | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/php-7.4.0-ldap_r.patch b/php-7.4.0-ldap_r.patch deleted file mode 100644 index 13566b4..0000000 --- a/php-7.4.0-ldap_r.patch +++ /dev/null @@ -1,19 +0,0 @@ - -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) - |