diff options
| author | Peter Korsgaard <peter@korsgaard.com> | 2017-06-01 22:28:14 +0200 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2017-06-01 22:28:14 +0200 |
| commit | 11271540bfe6adafbc133caf6b5b902a816f5f02 (patch) | |
| tree | 48df469d4e88c7e6efc0a8f4f8d5a386468ed72b /package/libmaxminddb/0001-Add-disable-tests-to-configure.patch | |
| parent | 24d6c5258ee38c38f0156b057cecd3cfe7ed7b1d (diff) | |
| parent | 8e5eef6c323c6a928ccea7279b3d9848419b99d9 (diff) | |
| download | buildroot-11271540bfe6adafbc133caf6b5b902a816f5f02.tar.gz buildroot-11271540bfe6adafbc133caf6b5b902a816f5f02.zip | |
Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/libmaxminddb/0001-Add-disable-tests-to-configure.patch')
| -rw-r--r-- | package/libmaxminddb/0001-Add-disable-tests-to-configure.patch | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/package/libmaxminddb/0001-Add-disable-tests-to-configure.patch b/package/libmaxminddb/0001-Add-disable-tests-to-configure.patch deleted file mode 100644 index 8ff64e9ebd..0000000000 --- a/package/libmaxminddb/0001-Add-disable-tests-to-configure.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 8287848f747bd37298a2d32b8fd06cc59eb28028 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine <fontaine.fabrice@gmail.com> -Date: Thu, 9 Feb 2017 21:40:43 +0100 -Subject: [PATCH] Add --disable-tests to configure - -Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> ---- - Makefile.am | 6 +++++- - configure.ac | 6 ++++++ - 2 files changed, 11 insertions(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index 1804945..cebcd31 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -5,8 +5,12 @@ nodist_include_HEADERS = include/maxminddb_config.h - - SUBDIRS = \ - src \ -- bin \ -+ bin -+ -+if TESTS -+SUBDIRS += \ - t -+endif - - EXTRA_DIST = doc t Changes.md LICENSE NOTICE README.md projects/VS12 projects/VS12-tests - dist-hook: -diff --git a/configure.ac b/configure.ac -index 7916212..2a22fab 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -119,6 +119,12 @@ AC_ARG_ENABLE( - esac],[debug=false]) - AM_CONDITIONAL([DEBUG], [test x$debug = xtrue]) - -+AC_ARG_ENABLE([tests], -+ AS_HELP_STRING([--enable-tests], [Compilation of tests code]), -+ [enable_tests=${enableval}], -+ [enable_tests=yes]) -+AM_CONDITIONAL([TESTS], [test "${enable_tests}" = "yes"]) -+ - AC_CONFIG_FILES([Makefile - src/Makefile - bin/Makefile --- -2.5.0 - |
