[gnome-ostree] manifest: geoclue srcdir != builddir patch
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-ostree] manifest: geoclue srcdir != builddir patch
- Date: Sat, 3 Aug 2013 17:07:45 +0000 (UTC)
commit 4a605f0e52334c7c36c57789517f76c7cebd16cb
Author: Colin Walters <walters verbum org>
Date: Sat Aug 3 13:07:03 2013 -0400
manifest: geoclue srcdir != builddir patch
manifest.json | 3 ++-
patches/geoclue-builddir.patch | 28 ++++++++++++++++++++++++++++
2 files changed, 30 insertions(+), 1 deletions(-)
---
diff --git a/manifest.json b/manifest.json
index 8ee6e34..74a45d2 100644
--- a/manifest.json
+++ b/manifest.json
@@ -658,7 +658,8 @@
{"src": "gnome:geocode-glib"},
- {"src": "fd:geoclue"},
+ {"src": "fd:geoclue",
+ "patches": ["geoclue-builddir.patch"]},
{"src": "git:http://git.chromium.org/webm/libwebp.git"},
diff --git a/patches/geoclue-builddir.patch b/patches/geoclue-builddir.patch
new file mode 100644
index 0000000..80d71d2
--- /dev/null
+++ b/patches/geoclue-builddir.patch
@@ -0,0 +1,28 @@
+From 1822e8d9c6487a4d99d97c6efeb1708e0bfa4485 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters verbum org>
+Date: Sat, 3 Aug 2013 13:03:40 -0400
+Subject: [PATCH] demo: Fix srcdir != builddir, and use libtool for linking
+
+libtool knows how to handle the .la file, don't use -L manually.
+---
+ demo/Makefile.am | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/demo/Makefile.am b/demo/Makefile.am
+index 2f55681..acb6b15 100644
+--- a/demo/Makefile.am
++++ b/demo/Makefile.am
+@@ -2,8 +2,8 @@ noinst_PROGRAMS = where-am-i
+
+ where_am_i_SOURCES = where-am-i.c
+ where_am_i_CFLAGS = -I$(top_srcdir)/src \
++ -I$(top_builddir)/src \
+ $(GEOCLUE_CFLAGS) \
+ -DLOCALEDIR="\"$(datadir)/locale\""
+-where_am_i_LDADD = -L$(top_srcdir)/src \
+- -lgeoclue-1.0 \
++where_am_i_LDADD = $(top_builddir)/src/libgeoclue-1.0.la \
+ $(GEOCLUE_LIBS)
+--
+1.7.1
+
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]