From 442b0de33b4ab899fd3ee25c5f41a979922d0db1 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 19 Nov 2020 10:37:54 +0100 Subject: update to 8.1.0 drop all patches merged upstream --- 11.patch | 37 ------------------------------------- 1 file changed, 37 deletions(-) delete mode 100644 11.patch (limited to '11.patch') diff --git a/11.patch b/11.patch deleted file mode 100644 index be346f2..0000000 --- a/11.patch +++ /dev/null @@ -1,37 +0,0 @@ -From e73c4c546dc7845cd161e51ffe339acb5421c39b Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Thu, 24 Sep 2020 11:37:49 +0200 -Subject: [PATCH] remove remaining hardcoded /lib - ---- - config.m4 | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/config.m4 b/config.m4 -index 5abb4fa..b8041bc 100644 ---- a/config.m4 -+++ b/config.m4 -@@ -9,7 +9,7 @@ dnl Make sure that the comment is aligned: - if test "$PHP_IP2LOCATION" != "no"; then - - # --with-ip2location -> check with-path -- SEARCH_PATH="/usr/local /usr /opt/local /lib" -+ SEARCH_PATH="/usr/local /usr /opt/local" - SEARCH_FOR="/include/IP2Location.h" - if test -r $PHP_IP2LOCATION/$SEARCH_FOR; then - IP2LOCATION_DIR=$PHP_IP2LOCATION -@@ -43,12 +43,12 @@ if test "$PHP_IP2LOCATION" != "no"; then - - PHP_CHECK_LIBRARY($LIBNAME,$LIBSYMBOLNEW, - [ -- PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $IP2LOCATION_DIR/lib, IP2LOCATION_SHARED_LIBADD) -+ PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $IP2LOCATION_DIR/$PHP_LIBDIR, IP2LOCATION_SHARED_LIBADD) - AC_DEFINE(HAVE_IPLOCATIONLIB,1,[ ]) - ],[ - PHP_CHECK_LIBRARY($LIBNAME,$LIBSYMBOLOLD, - [ -- PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $IP2LOCATION_DIR/lib, IP2LOCATION_SHARED_LIBADD) -+ PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $IP2LOCATION_DIR/$PHP_LIBDIR, IP2LOCATION_SHARED_LIBADD) - AC_DEFINE(HAVE_IPLOCATIONLIB,1,[ ]) - ],[ - AC_MSG_ERROR([wrong ip2location, lib version >= 6.x.x is required or library not found]) -- cgit