Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 674740 Details for
Bug 756355
dev-libs/dbus-glib-0.110: backport pkg-config fix
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Backport
0001-dev-libs-dbus-glib-backport-pkg-config-fix-for-glib-.patch (text/plain), 5.11 KB, created by
David Michael
on 2020-11-24 16:02:01 UTC
(
hide
)
Description:
Backport
Filename:
MIME Type:
Creator:
David Michael
Created:
2020-11-24 16:02:01 UTC
Size:
5.11 KB
patch
obsolete
>From 549672a49246f17a8babbe84a5a4ee9c794fc708 Mon Sep 17 00:00:00 2001 >From: David Michael <fedora.dm0@gmail.com> >Date: Tue, 24 Nov 2020 11:00:53 -0500 >Subject: [PATCH] dev-libs/dbus-glib: backport pkg-config fix for > glib-genmarshal > >Closes: https://bugs.gentoo.org/756355 >Package-Manager: Portage-3.0.9, Repoman-3.0.2 >Signed-off-by: David Michael <fedora.dm0@gmail.com> >--- > dev-libs/dbus-glib/dbus-glib-0.110.ebuild | 9 ++- > ...bus-glib-0.110-config-glib-genmarshal.conf | 76 +++++++++++++++++++ > 2 files changed, 84 insertions(+), 1 deletion(-) > create mode 100644 dev-libs/dbus-glib/files/dbus-glib-0.110-config-glib-genmarshal.conf > >diff --git a/dev-libs/dbus-glib/dbus-glib-0.110.ebuild b/dev-libs/dbus-glib/dbus-glib-0.110.ebuild >index 6e817d8bfe9..2d3b43af461 100644 >--- a/dev-libs/dbus-glib/dbus-glib-0.110.ebuild >+++ b/dev-libs/dbus-glib/dbus-glib-0.110.ebuild >@@ -2,7 +2,7 @@ > # Distributed under the terms of the GNU General Public License v2 > > EAPI=7 >-inherit bash-completion-r1 multilib-minimal toolchain-funcs >+inherit autotools bash-completion-r1 multilib-minimal toolchain-funcs > > DESCRIPTION="D-Bus bindings for glib" > HOMEPAGE="https://dbus.freedesktop.org/" >@@ -31,11 +31,18 @@ BDEPEND=" > > DOCS=( AUTHORS ChangeLog HACKING NEWS README ) > >+PATCHES=( "${FILESDIR}"/${P}-config-glib-genmarshal.conf ) >+ > set_TBD() { > # out of sources build dir for make check > export TBD="${BUILD_DIR}-tests" > } > >+src_prepare() { >+ default >+ eautoreconf >+} >+ > multilib_src_configure() { > local myconf=( > --localstatedir="${EPREFIX}"/var >diff --git a/dev-libs/dbus-glib/files/dbus-glib-0.110-config-glib-genmarshal.conf b/dev-libs/dbus-glib/files/dbus-glib-0.110-config-glib-genmarshal.conf >new file mode 100644 >index 00000000000..463638710ad >--- /dev/null >+++ b/dev-libs/dbus-glib/files/dbus-glib-0.110-config-glib-genmarshal.conf >@@ -0,0 +1,76 @@ >+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 >+ >-- >2.26.2 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 756355
: 674740