From 122edc9ae0bfe968947801e1ff5c931bbf52c5c8 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 21 Nov 2018 07:25:25 +0100
Subject: update to 1.4.0 open
 https://github.com/maxmind/MaxMind-DB-Reader-php/issues/79 to report test
 failure on 32-bit

---
 d4d7845adb0b08d294a9255d9254b5f5cc6aba80.patch | 50 --------------------------
 1 file changed, 50 deletions(-)
 delete mode 100644 d4d7845adb0b08d294a9255d9254b5f5cc6aba80.patch

(limited to 'd4d7845adb0b08d294a9255d9254b5f5cc6aba80.patch')

diff --git a/d4d7845adb0b08d294a9255d9254b5f5cc6aba80.patch b/d4d7845adb0b08d294a9255d9254b5f5cc6aba80.patch
deleted file mode 100644
index d45ff8d..0000000
--- a/d4d7845adb0b08d294a9255d9254b5f5cc6aba80.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From d4d7845adb0b08d294a9255d9254b5f5cc6aba80 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Wed, 7 Nov 2018 14:05:06 +0100
-Subject: [PATCH] retrieve build options from pkg-config
-
----
- ext/config.m4 | 25 +++++++++++++++++++++++--
- 1 file changed, 23 insertions(+), 2 deletions(-)
-
-diff --git a/ext/config.m4 b/ext/config.m4
-index a08bb2c..efddab5 100644
---- a/ext/config.m4
-+++ b/ext/config.m4
-@@ -6,13 +6,34 @@ PHP_ARG_ENABLE(maxminddb-debug, for MaxMind DB debug support,
-     [ --enable-maxminddb-debug    Enable enable MaxMind DB deubg support], no, no)
- 
- if test $PHP_MAXMINDDB != "no"; then
--    PHP_CHECK_LIBRARY(maxminddb, MMDB_open)
-+
-+    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-+
-+    AC_MSG_CHECKING(for libmaxminddb)
-+    if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libmaxminddb; then
-+        dnl retrieve build options from pkg-config
-+        if $PKG_CONFIG libzip --atleast-version 0; then
-+            LIBMAXMINDDB_INC=`$PKG_CONFIG libmaxminddb --cflags`
-+            LIBMAXMINDDB_LIB=`$PKG_CONFIG libmaxminddb --libs`
-+            LIBMAXMINDDB_VER=`$PKG_CONFIG libmaxminddb --modversion`
-+            AC_MSG_RESULT(found version $LIBMAXMINDDB_VER)
-+        else
-+            AC_MSG_ERROR(system libmaxminddb must be upgraded to version >= 0)
-+        fi
-+        PHP_EVAL_LIBLINE($LIBMAXMINDDB_LIB, MAXMINDDB_SHARED_LIBADD)
-+        PHP_EVAL_INCLINE($LIBMAXMINDDB_INC)
-+    else
-+        AC_MSG_RESULT(pkg-config information missing)
-+        AC_MSG_WARN(will use libmaxmxinddb from compiler default path)
-+
-+        PHP_CHECK_LIBRARY(maxminddb, MMDB_open)
-+        PHP_ADD_LIBRARY(maxminddb, 1, MAXMINDDB_SHARED_LIBADD)
-+    fi
- 
-     if test $PHP_MAXMINDDB_DEBUG != "no"; then
-         CFLAGS="$CFLAGS -Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Werror"
-     fi
- 
--    PHP_ADD_LIBRARY(maxminddb, 1, MAXMINDDB_SHARED_LIBADD)
-     PHP_SUBST(MAXMINDDB_SHARED_LIBADD)
- 
-     PHP_NEW_EXTENSION(maxminddb, maxminddb.c, $ext_shared)
-- 
cgit