summaryrefslogtreecommitdiffstats
path: root/patches/eggdbus-0.6/eggdbus-0.6-host-tools.diff
blob: 615af6be1cd3702e220626677c02dd556fdc7277 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
Subject: [patch] make eggdbus crosscompile aware
From: Robert Schwebel <r.schwebel@pengutronix.de>

The build system compiles tools like eggdbus-glib-genmarshal and
eggdbus-binding-tool; if you cross compile the package, these fines are
built for the "host" architecture, not for the "build" one, but the
Makefile tries to run the cross compiled binaries then.

Make it possible to overwrite them from the configure command line.

Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>

---
 configure.ac            |   10 ++++++++++
 src/eggdbus/Makefile.am |    2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

Index: eggdbus-0.6/configure.ac
===================================================================
--- eggdbus-0.6.orig/configure.ac
+++ eggdbus-0.6/configure.ac
@@ -34,6 +34,16 @@ AM_CONDITIONAL(MAN_PAGES_ENABLED, test x
 
 GTK_DOC_CHECK([1.3])
 
+EGGDBUS_TOOLS=""
+AC_ARG_WITH(eggdbus-tools,
+  AS_HELP_STRING([--with-eggdbus-tools],[path to eggdbus-binding-tool (for cross compilation)]),
+[
+  EGGDBUS_TOOLS="$withval"
+],[
+  EGGDBUS_TOOLS="\$(top_builddir)/src/eggdbus"
+])
+AC_SUBST(EGGDBUS_TOOLS)
+
 #### gcc warning flags
 
 if test "x$GCC" = "xyes"; then
Index: eggdbus-0.6/src/eggdbus/Makefile.am
===================================================================
--- eggdbus-0.6.orig/src/eggdbus/Makefile.am
+++ eggdbus-0.6/src/eggdbus/Makefile.am
@@ -130,7 +130,7 @@ BUILT_SOURCES =								\
 	$(NULL)
 
 eggdbus-built-sources.stamp : eggdbus-binding-tool Makefile.am org.freedesktop.DBus.xml org.freedesktop.DBus.Peer.xml org.freedesktop.DBus.Properties.xml org.freedesktop.DBus.Introspectable.xml eggdbus-glib-genmarshal
-	EGG_DBUS_GENMARSHAL=$(top_builddir)/src/eggdbus/eggdbus-glib-genmarshal $(top_builddir)/src/eggdbus/eggdbus-binding-tool							\
+	EGG_DBUS_GENMARSHAL=$(EGGDBUS_TOOLS)/eggdbus-glib-genmarshal $(EGGDBUS_TOOLS)/eggdbus-binding-tool							\
 		--namespace EggDBus									\
 		--dbus-namespace org.freedesktop.DBus							\
 		--interfaces-only									\