From: <kai.kang@windriver.com>
To: <richard.purdie@linuxfoundation.org>
Cc: openembedded-core@lists.openembedded.org
Subject: [PATCH 3/3] vala: update vapigen-wrapper
Date: Wed, 10 Oct 2018 23:03:01 +0800 [thread overview]
Message-ID: <8f9f9d7165fe23703f67df7e4e421ad912749cbd.1539182705.git.kai.kang@windriver.com> (raw)
In-Reply-To: <cover.1539182705.git.kai.kang@windriver.com>
From: Kai Kang <kai.kang@windriver.com>
The .gir files from gobject-introspection are configured to install to
${libdir}/gir-1.0 when multilib is enabled. Update vapigen-wrapper accordingly.
Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
meta/recipes-devtools/vala/vala.inc | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/vala/vala.inc b/meta/recipes-devtools/vala/vala.inc
index b22faad780..f680640ca6 100644
--- a/meta/recipes-devtools/vala/vala.inc
+++ b/meta/recipes-devtools/vala/vala.inc
@@ -24,12 +24,15 @@ inherit autotools pkgconfig upstream-version-is-even
FILES_${PN} += "${datadir}/${BPN}-${SHRT_VER}/vapi ${libdir}/${BPN}-${SHRT_VER}/"
FILES_${PN}-doc += "${datadir}/devhelp"
+# .gir files from gobject-introspection are installed to ${libdir} when multilib is enabled
+GIRDIR_OPT = "${@'--girdir=${STAGING_LIBDIR}/gir-1.0' if d.getVar('MULTILIBS') else ''}"
+
do_configure_prepend_class-target() {
# Write out a vapigen wrapper that will be provided by pkg-config file installed in target sysroot
# The wrapper will call a native vapigen
cat > ${B}/vapigen-wrapper << EOF
#!/bin/sh
-vapigen-${SHRT_VER} "\$@"
+vapigen-${SHRT_VER} ${GIRDIR_OPT} "\$@"
EOF
chmod +x ${B}/vapigen-wrapper
}
@@ -55,3 +58,5 @@ vapigen_sysroot_preprocess() {
-e "s|vapigen=.*|vapigen=${bindir}/vapigen-wrapper|" \
${SYSROOT_DESTDIR}${libdir}/pkgconfig/vapigen-${SHRT_VER}.pc
}
+
+SSTATE_SCAN_FILES += "vapigen-wrapper"
--
2.18.0
next prev parent reply other threads:[~2018-10-10 15:45 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-10 15:02 [PATCH V2 0/3] Fix multilib install file conflict of gobject-introspection kai.kang
2018-10-10 15:02 ` [PATCH 1/3] gobject-introspection: add required python modules to rdepends kai.kang
2018-10-11 21:54 ` Burton, Ross
2018-10-10 15:03 ` [PATCH 2/3] gobject-introspection: fix multilib install file conflicts kai.kang
2018-10-10 15:03 ` kai.kang [this message]
2018-10-12 5:47 [PATCH v3 0/3] Fix multilib install file conflict of gobject-introspection kai.kang
2018-10-12 5:47 ` [PATCH 3/3] vala: update vapigen-wrapper kai.kang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8f9f9d7165fe23703f67df7e4e421ad912749cbd.1539182705.git.kai.kang@windriver.com \
--to=kai.kang@windriver.com \
--cc=openembedded-core@lists.openembedded.org \
--cc=richard.purdie@linuxfoundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.