[Buildroot] [PATCH 1/2] package/ipcalc: add libmaxminddb support

[Buildroot] [PATCH 1/2] package/ipcalc: add libmaxminddb support

[Fabrice Fontaine]

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/ipcalc/ipcalc.mk | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/package/ipcalc/ipcalc.mk b/package/ipcalc/ipcalc.mk
index ff9d643389..145b6904b9 100644
--- a/package/ipcalc/ipcalc.mk
+++ b/package/ipcalc/ipcalc.mk
@@ -10,8 +10,13 @@ IPCALC_SOURCE = ipcalc-$(IPCALC_VERSION).tar.bz2
 IPCALC_LICENSE = GPL-2.0+
 IPCALC_LICENSE_FILES = COPYING
 
-IPCALC_CONF_OPTS = \
-	-Duse_maxminddb=disabled \
-	-Duse_geoip=disabled
+IPCALC_CONF_OPTS = -Duse_geoip=disabled
+
+ifeq ($(BR2_PACKAGE_LIBMAXMINDDB),y)
+IPCALC_CONF_OPTS += -Duse_maxminddb=enabled
+IPCALC_DEPENDENCIES += host-pkgconf libmaxminddb
+else
+IPCALC_CONF_OPTS += -Duse_maxminddb=disabled
+endif
 
 $(eval $(meson-package))
-- 
2.33.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 2/2] package/ipcalc: add geoip support

[Fabrice Fontaine]

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/ipcalc/ipcalc.mk | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/package/ipcalc/ipcalc.mk b/package/ipcalc/ipcalc.mk
index 145b6904b9..8a43200456 100644
--- a/package/ipcalc/ipcalc.mk
+++ b/package/ipcalc/ipcalc.mk
@@ -10,7 +10,12 @@ IPCALC_SOURCE = ipcalc-$(IPCALC_VERSION).tar.bz2
 IPCALC_LICENSE = GPL-2.0+
 IPCALC_LICENSE_FILES = COPYING
 
-IPCALC_CONF_OPTS = -Duse_geoip=disabled
+ifeq ($(BR2_PACKAGE_GEOIP),y)
+IPCALC_CONF_OPTS += -Duse_geoip=enabled
+IPCALC_DEPENDENCIES += host-pkgconf geoip
+else
+IPCALC_CONF_OPTS += -Duse_geoip=disabled
+endif
 
 ifeq ($(BR2_PACKAGE_LIBMAXMINDDB),y)
 IPCALC_CONF_OPTS += -Duse_maxminddb=enabled
-- 
2.33.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/2] package/ipcalc: add libmaxminddb support

[Thomas Petazzoni]

On Wed, 20 Oct 2021 18:54:45 +0200
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:

> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
>  package/ipcalc/ipcalc.mk | 11 ++++++++---
>  1 file changed, 8 insertions(+), 3 deletions(-)

Both applied to master, thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot