package/dbus-glib: fix build with newer libglib2

RFC PATCH New Yann E. MORIN 1 participant 2 messages Dec 2, 2018 – Dec 3, 2018

Share & tools

Yann E. MORIN

author

2018-12-02 17:46 UTC #0 lore raw

RFC PATCH 1/1 package/dbus-glib: fix build with newer libglib2

Fix dbus-glib to use the AC_SUBSTituted variable that contains the path to glib-gen-marshal, so that we can override it from the command line.

Fixes:

    http://autobuild.buildroot.org/results/2e4/2e4285d47f6295e1b9f9c05abe34df443cad7f9e/
    ...

Signed-off-by "Yann E. MORIN" <[email protected]>

Cc Fabrice Fontaine <[email protected]>

Cc Thomas Petazzoni <[email protected]>

---
 ...buildsys-use-variable-for-glib-genmarshal.patch | 60 ++++++++++++++++++++++
 package/dbus-glib/dbus-glib.mk                     |  9 ++++
 2 files changed, 69 insertions(+)
 create mode 100644 package/dbus-glib/0001-buildsys-use-variable-for-glib-genmarshal.patch

package/dbus-glib/0001-buildsys-use-variable-for-glib-genmarshal.patch new file +60 -0

new file mode 100644
index 0000000000..a6acb5edaf
@@ -0,0 +1,60 @@
+From 259ee2897f7c9560e7df4451af59efd73be0951f Mon Sep 17 00:00:00 2001
+From: "Yann E. MORIN" <[email protected]>
+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).
+
+Rather than hard-code calls to @GLIB_GENMARSHAL@, let's use the variable
+$(GLIB_GENMARSHAL) instead, as it is substituted with autoconf's
+AC_SUBST(GLIB_GENMARSHAL).
+
+Signed-off-by: "Yann E. MORIN" <[email protected]>
+---
+Upstream status: pending
+    https://gitlab.freedesktop.org/dbus/dbus-glib/merge_requests/2
+---
+ dbus/Makefile.am                       | 4 ++--
+ dbus/examples/statemachine/Makefile.am | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+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>" > [email protected]
+-	@GLIB_GENMARSHAL@ --prefix=sm_marshal $(srcdir)/sm-marshal.list --header --body >> [email protected]
++	$(GLIB_GENMARSHAL) --prefix=sm_marshal $(srcdir)/sm-marshal.list --header --body >> [email protected]
+ 	mv [email protected] $@
+ 
+ sm-marshal.h: Makefile sm-marshal.list
+-	@GLIB_GENMARSHAL@ --prefix=sm_marshal $(srcdir)/sm-marshal.list --header > [email protected] && mv [email protected] $@
++	$(GLIB_GENMARSHAL) --prefix=sm_marshal $(srcdir)/sm-marshal.list --header > [email protected] && mv [email protected] $@
+ 
+ BUILT_SOURCES += sm-marshal.c sm-marshal.h
+ 
+-- 
+2.14.1
+

package/dbus-glib/dbus-glib.mk +9 -0

index 372942e1c3..611f194b81 100644
@@ -10,6 +10,9 @@ DBUS_GLIB_INSTALL_STAGING = YES
 DBUS_GLIB_LICENSE = AFL-2.1 or GPL-2.0+
 DBUS_GLIB_LICENSE_FILES = COPYING
 
+# 0001-buildsys-use-variable-for-glib-genmarshal.patch
+DBUS_GLIB_AUTORECONF = YES
+
 DBUS_GLIB_CONF_ENV = \
 	ac_cv_have_abstract_sockets=yes \
 	ac_cv_func_posix_getpwnam_r=yes \

@@ -24,6 +27,9 @@ DBUS_GLIB_CONF_OPTS = \
 	--disable-doxygen-docs \
 	--enable-asserts=yes
 
+DBUS_GLIB_MAKE_OPTS = \
+	GLIB_GENMARSHAL=$(STAGING_DIR)/usr/bin/glib-genmarshal
+
 DBUS_GLIB_DEPENDENCIES = host-pkgconf dbus host-dbus host-dbus-glib libglib2 expat
 
 HOST_DBUS_GLIB_DEPENDENCIES = host-dbus host-expat host-libglib2

@@ -35,6 +41,9 @@ HOST_DBUS_GLIB_CONF_OPTS = \
 	--disable-doxygen-docs \
 	--enable-asserts=yes
 
+HOST_DBUS_GLIB_MAKE_OPTS = \
+	GLIB_GENMARSHAL=$(HOST_DIR)/bin/glib-genmarshal
+
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

Signature · 1 line

2.14.1

Yann E. MORIN

author

2018-12-03 11:39 UTC #1 lore raw

RFC PATCH 1/1 package/dbus-glib: fix build with newer libglib2

All,

On 2018-12-02 18:46 +0100, Yann E. MORIN spake thusly:

Quoted 2 lines

Fix dbus-glib to use the AC_SUBSTituted variable that contains the path to glib-gen-marshal, so that we can override it from the command line.

I may have to withdraw that patch, now:

- the libglib2 bump was reverted, so this fix is no longer needed, and

- the pending pkgconf bump solves this issue.

So I've marked this patch as N/A in patchwork.

Regards,
Yann E. MORIN.

Quoted 116 lines