[gnome-ostree] manifest: Fix geoip



commit 4324d167557a4ab2fc78715c0c744e7a1964445c
Author: Colin Walters <walters verbum org>
Date:   Sat Aug 3 12:50:01 2013 -0400

    manifest: Fix geoip
    
    Ugh.

 manifest.json                                |    5 ++++-
 patches/geoip-bootstrap-use-autoreconf.patch |   25 +++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletions(-)
---
diff --git a/manifest.json b/manifest.json
index b9e18b0..8ee6e34 100644
--- a/manifest.json
+++ b/manifest.json
@@ -649,9 +649,12 @@
                                 "--disable-fatal-warnings"]},
 
                {"src": "tarball:http://www.maxmind.com/download/geoip/api/c/GeoIP-1.4.8.tar.gz";,
+                "rm-configure": true,
                 "name": "geoip",
+                "config-opts": ["--enable-static"],
                 "checksum": "cf0f6b2bac1153e34d6ef55ee3851479b347d2b5c191fda8ff6a51fab5291ff4",
-                "patches": ["geoip-1.4.8-add-pkg-config.patch"]},
+                "patches": ["geoip-1.4.8-add-pkg-config.patch",
+                            "geoip-bootstrap-use-autoreconf.patch"]},
 
                {"src": "gnome:geocode-glib"},
 
diff --git a/patches/geoip-bootstrap-use-autoreconf.patch b/patches/geoip-bootstrap-use-autoreconf.patch
new file mode 100644
index 0000000..1e68556
--- /dev/null
+++ b/patches/geoip-bootstrap-use-autoreconf.patch
@@ -0,0 +1,25 @@
+From 598c6b96a8003a2bae0ef2276a517c4b196e9428 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters verbum org>
+Date: Sat, 3 Aug 2013 12:32:10 -0400
+Subject: [PATCH] bootstrap: use autoreconf
+
+It's more reliable than reinventing our own.
+---
+ bootstrap |    4 +---
+ 1 files changed, 1 insertions(+), 3 deletions(-)
+
+diff --git a/bootstrap b/bootstrap
+index d3a651d..63200d6 100755
+--- a/bootstrap
++++ b/bootstrap
+@@ -3,6 +3,4 @@
+ # disable dependency trackeing for OS X with multiply arch option's
+ # automake -i --gnu --add-missing
+ 
+-aclocal \
+-&& automake -i --gnu --add-missing \
+-&& autoconf
++exec autoreconf -fvi
+-- 
+1.7.1
+


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]