Skip to contentSkip to conversation

package/suricata: fix build without geoip

PATCH New Fabrice Fontaine 3 participants 3 messages Oct 6, 2019 – Oct 27, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/suricata: fix build without geoip

Fixes:
- http://autobuild.buildroot.org/results/a7a34f760ae5fe0922fdb720b8234dbcd85ed222

---
 .../0002-configure.ac-fix-disable-geoip.patch | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 package/suricata/0002-configure.ac-fix-disable-geoip.patch
package/suricata/0002-configure.ac-fix-disable-geoip.patch new file +33 -0
new file mode 100644
index 0000000000..7dae57a875
@@ -0,0 +1,33 @@
+From 4e8b006cdd30e43f3ab11296710170488fd5b5de Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <[email protected]>
+Date: Sun, 6 Oct 2019 09:53:23 +0200
+Subject: [PATCH] configure.ac: fix --disable-geoip
+
+$enableval should be used to know if the user has passed --enable-geoip
+or --disable-geoip
+
+Fixes:
+ - http://autobuild.buildroot.org/results/a7a34f760ae5fe0922fdb720b8234dbcd85ed222
+
+Signed-off-by: Fabrice Fontaine <[email protected]>
+Upstream status: https://github.com/OISF/suricata/pull/4278
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 3df576d54..fa671024d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2143,7 +2143,7 @@
+   # libmaxminddb
+     AC_ARG_ENABLE(geoip,
+ 	        AS_HELP_STRING([--enable-geoip],[Enable GeoIP support]),
+-	        [ enable_geoip="yes"],
++	        [ enable_geoip="$enableval"],
+ 	        [ enable_geoip="no"])
+     AC_ARG_ENABLE(libgeoip,
+     AS_HELP_STRING([--disable-libgeoip], [Disable libgeoip support]),
+-- 
+2.23.0
+
Signature · 1 line
2.23.0
#1 lore raw

PATCH 1/1 package/suricata: fix build without geoip

Quoted 8 lines · On Sun, 6 Oct 2019 10:22:37 +0200 Fabrice Fontaine…

Fixes:
- http://autobuild.buildroot.org/results/a7a34f760ae5fe0922fdb720b8234dbcd85ed222

---
 .../0002-configure.ac-fix-disable-geoip.patch | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 package/suricata/0002-configure.ac-fix-disable-geoip.patch

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com