Attachment #674740 for bug #756355

View | Details | Raw Unified | Return to bug 756355
Collapse All | Expand All

Lines 2-8 Link Here

(-)a/dev-libs/dbus-glib/dbus-glib-0.110.ebuild (-1 / +8 lines)
2	# Distributed under the terms of the GNU General Public License v2	2	# Distributed under the terms of the GNU General Public License v2
3		3
4	EAPI=7	4	EAPI=7
5	inherit bash-completion-r1 multilib-minimal toolchain-funcs	5	inherit autotools bash-completion-r1 multilib-minimal toolchain-funcs
6		6
7	DESCRIPTION="D-Bus bindings for glib"	7	DESCRIPTION="D-Bus bindings for glib"
8	HOMEPAGE="https://dbus.freedesktop.org/"	8	HOMEPAGE="https://dbus.freedesktop.org/"
Lines 31-41 BDEPEND=" Link Here
31		31
32	DOCS=( AUTHORS ChangeLog HACKING NEWS README )	32	DOCS=( AUTHORS ChangeLog HACKING NEWS README )
33		33
		34	PATCHES=( "${FILESDIR}"/${P}-config-glib-genmarshal.conf )
		35
34	set_TBD() {	36	set_TBD() {
35	# out of sources build dir for make check	37	# out of sources build dir for make check
36	export TBD="${BUILD_DIR}-tests"	38	export TBD="${BUILD_DIR}-tests"
37	}	39	}
38		40
		41	src_prepare() {
		42	default
		43	eautoreconf
		44	}
		45
39	multilib_src_configure() {	46	multilib_src_configure() {
40	local myconf=(	47	local myconf=(
41	--localstatedir="${EPREFIX}"/var	48	--localstatedir="${EPREFIX}"/var




From 39f0ae6152acfb3d8ca086090a02e0aa8742f050 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sun, 2 Dec 2018 16:26:07 +0100
Subject: [PATCH] buildsys: use variable for glib-genmarshal

When doing cross-compilation, the path returned by pkg-config for
glib-genmarshal can be incorrect (because it is the runtime path,
not the build-time path).

Change configure.ac to use pkg-config to get the variable.

This allows overridig the path at configure time, by using the configure
option GLIB_GENMARSHAL=/path/toglib-genmarshal

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
[smcv: Fix typo in commit message]
Reviewed-by: Simon McVittie <smcv@collabora.com>
---
 configure.ac                           | 4 ++--
 dbus/Makefile.am                       | 4 ++--
 dbus/examples/statemachine/Makefile.am | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index e00bc38..8be3147 100644
--- a/configure.ac
+++ b/configure.ac
@@ -267,8 +267,8 @@ AC_DEFINE([GLIB_VERSION_MIN_REQUIRED], [GLIB_VERSION_2_32],
   [Warn on use of APIs deprecated before GLib 2.32])
 PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.40, gobject-2.0 >= 2.40, gio-2.0 >= 2.40])
 
-GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
-AC_SUBST(GLIB_GENMARSHAL)
+PKG_CHECK_VAR([GLIB_GENMARSHAL], [glib-2.0], [glib_genmarshal],,
+    [AC_MSG_ERROR([cannot find glib-genmarshal])])
 
 dnl GLib flags
 AC_SUBST(GLIB_CFLAGS)
diff --git a/dbus/Makefile.am b/dbus/Makefile.am
index 37c6334..2e8cb27 100644
--- a/dbus/Makefile.am
+++ b/dbus/Makefile.am
@@ -87,10 +87,10 @@ dbus_binding_tool_LDADD= $(builddir)/libdbus-gtool.la $(builddir)/libdbus-glib-1
 ## we just rebuilt these manually and check them into cvs; easier than
 ## convincing automake/make to do this properly
 regenerate-built-sources:
-	@GLIB_GENMARSHAL@ --prefix=_dbus_g_marshal dbus-gmarshal.list --header > dbus-gmarshal.h && \
+	$(GLIB_GENMARSHAL) --prefix=_dbus_g_marshal dbus-gmarshal.list --header > dbus-gmarshal.h && \
 	echo '#include <config.h>' > dbus-gmarshal.c &&						    \
 	echo '#include "dbus-gmarshal.h"' >> dbus-gmarshal.c &&					    \
-        @GLIB_GENMARSHAL@ --prefix=_dbus_g_marshal dbus-gmarshal.list --body >> dbus-gmarshal.c
+        $(GLIB_GENMARSHAL) --prefix=_dbus_g_marshal dbus-gmarshal.list --body >> dbus-gmarshal.c
 
 
 completiondir = $(sysconfdir)/bash_completion.d
diff --git a/dbus/examples/statemachine/Makefile.am b/dbus/examples/statemachine/Makefile.am
index 187b044..c8fe029 100644
--- a/dbus/examples/statemachine/Makefile.am
+++ b/dbus/examples/statemachine/Makefile.am
@@ -35,11 +35,11 @@ statemachine-glue.h: statemachine.xml
 
 sm-marshal.c: Makefile sm-marshal.list
 	echo "#include <config.h>" > $@.tmp
-	@GLIB_GENMARSHAL@ --prefix=sm_marshal $(srcdir)/sm-marshal.list --header --body >> $@.tmp
+	$(GLIB_GENMARSHAL) --prefix=sm_marshal $(srcdir)/sm-marshal.list --header --body >> $@.tmp
 	mv $@.tmp $@
 
 sm-marshal.h: Makefile sm-marshal.list
-	@GLIB_GENMARSHAL@ --prefix=sm_marshal $(srcdir)/sm-marshal.list --header > $@.tmp && mv $@.tmp $@
+	$(GLIB_GENMARSHAL) --prefix=sm_marshal $(srcdir)/sm-marshal.list --header > $@.tmp && mv $@.tmp $@
 
 BUILT_SOURCES += sm-marshal.c sm-marshal.h
 
-- 
GitLab


Return to bug 756355

Line 0 Link Here

(-)a/dev-libs/dbus-glib/files/dbus-glib-0.110-config-glib-genmarshal.conf (-1 / +76 lines)
0	-	1	From 39f0ae6152acfb3d8ca086090a02e0aa8742f050 Mon Sep 17 00:00:00 2001
		2	From: "Yann E. MORIN" <yann.morin.1998@free.fr>
		3	Date: Sun, 2 Dec 2018 16:26:07 +0100
		4	Subject: [PATCH] buildsys: use variable for glib-genmarshal
		5
		6	When doing cross-compilation, the path returned by pkg-config for
		7	glib-genmarshal can be incorrect (because it is the runtime path,
		8	not the build-time path).
		9
		10	Change configure.ac to use pkg-config to get the variable.
		11
		12	This allows overridig the path at configure time, by using the configure
		13	option GLIB_GENMARSHAL=/path/toglib-genmarshal
		14
		15	Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
		16	[smcv: Fix typo in commit message]
		17	Reviewed-by: Simon McVittie <smcv@collabora.com>
		18	---
		19	configure.ac \| 4 ++--
		20	dbus/Makefile.am \| 4 ++--
		21	dbus/examples/statemachine/Makefile.am \| 4 ++--
		22	3 files changed, 6 insertions(+), 6 deletions(-)
		23
		24	diff --git a/configure.ac b/configure.ac
		25	index e00bc38..8be3147 100644
		26	--- a/configure.ac
		27	+++ b/configure.ac
		28	@@ -267,8 +267,8 @@ AC_DEFINE([GLIB_VERSION_MIN_REQUIRED], [GLIB_VERSION_2_32],
		29	[Warn on use of APIs deprecated before GLib 2.32])
		30	PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.40, gobject-2.0 >= 2.40, gio-2.0 >= 2.40])
		31
		32	-GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
		33	-AC_SUBST(GLIB_GENMARSHAL)
		34	+PKG_CHECK_VAR([GLIB_GENMARSHAL], [glib-2.0], [glib_genmarshal],,
		35	+ [AC_MSG_ERROR([cannot find glib-genmarshal])])
		36
		37	dnl GLib flags
		38	AC_SUBST(GLIB_CFLAGS)
		39	diff --git a/dbus/Makefile.am b/dbus/Makefile.am
		40	index 37c6334..2e8cb27 100644
		41	--- a/dbus/Makefile.am
		42	+++ b/dbus/Makefile.am
		43	@@ -87,10 +87,10 @@ dbus_binding_tool_LDADD= $(builddir)/libdbus-gtool.la $(builddir)/libdbus-glib-1
		44	## we just rebuilt these manually and check them into cvs; easier than
		45	## convincing automake/make to do this properly
		46	regenerate-built-sources:
		47	- @GLIB_GENMARSHAL@ --prefix=_dbus_g_marshal dbus-gmarshal.list --header > dbus-gmarshal.h && \
		48	+ $(GLIB_GENMARSHAL) --prefix=_dbus_g_marshal dbus-gmarshal.list --header > dbus-gmarshal.h && \
		49	echo '#include <config.h>' > dbus-gmarshal.c && \
		50	echo '#include "dbus-gmarshal.h"' >> dbus-gmarshal.c && \
		51	- @GLIB_GENMARSHAL@ --prefix=_dbus_g_marshal dbus-gmarshal.list --body >> dbus-gmarshal.c
		52	+ $(GLIB_GENMARSHAL) --prefix=_dbus_g_marshal dbus-gmarshal.list --body >> dbus-gmarshal.c
		53
		54
		55	completiondir = $(sysconfdir)/bash_completion.d
		56	diff --git a/dbus/examples/statemachine/Makefile.am b/dbus/examples/statemachine/Makefile.am
		57	index 187b044..c8fe029 100644
		58	--- a/dbus/examples/statemachine/Makefile.am
		59	+++ b/dbus/examples/statemachine/Makefile.am
		60	@@ -35,11 +35,11 @@ statemachine-glue.h: statemachine.xml
		61
		62	sm-marshal.c: Makefile sm-marshal.list
		63	echo "#include <config.h>" > $@.tmp
		64	- @GLIB_GENMARSHAL@ --prefix=sm_marshal $(srcdir)/sm-marshal.list --header --body >> $@.tmp
		65	+ $(GLIB_GENMARSHAL) --prefix=sm_marshal $(srcdir)/sm-marshal.list --header --body >> $@.tmp
66	mv $@.tmp $@
67
68	sm-marshal.h: Makefile sm-marshal.list
69	- @GLIB_GENMARSHAL@ --prefix=sm_marshal $(srcdir)/sm-marshal.list --header > $@.tmp && mv $@.tmp $@
70	+ $(GLIB_GENMARSHAL) --prefix=sm_marshal $(srcdir)/sm-marshal.list --header > $@.tmp && mv $@.tmp $@
71
72	BUILT_SOURCES += sm-marshal.c sm-marshal.h
73
74	--
75	GitLab
76