[oe-commits] [openembedded-core] 07/24: glib-networking: Support building with USE_NLS=no

git at git.openembedded.org git at git.openembedded.org
Fri Aug 2 15:54:21 UTC 2019


This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit d63ab3e11a324f3235113c9cd400424db0c6bc0a
Author: Mike Crowe <mac at mcrowe.com>
AuthorDate: Tue Jul 30 12:00:35 2019 +0100

    glib-networking: Support building with USE_NLS=no
    
    As reported in
    http://lists.openembedded.org/pipermail/openembedded-core/2019-February/279344.html
    , glib-networking no longer configures successfully if USE_NLS="no":
    
    | po/meson.build:1:5: ERROR:  Can not do gettext because xgettext is not installed.
    
    In the current absence of anything better, it seems that this can be
    overcome by telling Meson not to look in the po/ directory.
    
    Signed-off-by: Mike Crowe <mac at mcrowe.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/recipes-core/glib-networking/glib-networking_2.60.2.bb | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/meta/recipes-core/glib-networking/glib-networking_2.60.2.bb b/meta/recipes-core/glib-networking/glib-networking_2.60.2.bb
index 4d4fe64..fa7fddf 100644
--- a/meta/recipes-core/glib-networking/glib-networking_2.60.2.bb
+++ b/meta/recipes-core/glib-networking/glib-networking_2.60.2.bb
@@ -30,3 +30,13 @@ FILES_${PN} += "\
                 "
 FILES_${PN}-dev += "${libdir}/gio/modules/libgio*.la"
 FILES_${PN}-staticdev += "${libdir}/gio/modules/libgio*.a"
+
+# meson lacks support for --disable-nls.
+disable_nls() {
+    sed -i "/subdir('po')/d" ${S}/meson.build
+}
+
+do_unpack_append() {
+    if d.getVar('USE_NLS') == 'no':
+        bb.build.exec_func('disable_nls', d)
+}

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Openembedded-commits mailing list