From 7c0032b81f56fea5bec33aa0e74d6e28873f72a8 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 16 Jun 2017 14:37:33 +0300 Subject: gettext: relocate msgfmt utility for all recipes Now that epiphany needs a working msgfmt as well, let's do this trick where it should be. Signed-off-by: Alexander Kanavin --- meta/recipes-core/gettext/gettext_0.19.8.1.bb | 4 ++++ meta/recipes-kernel/sysprof/sysprof_3.24.1.bb | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-core/gettext/gettext_0.19.8.1.bb b/meta/recipes-core/gettext/gettext_0.19.8.1.bb index 97e7986dc1..c2059e608b 100644 --- a/meta/recipes-core/gettext/gettext_0.19.8.1.bb +++ b/meta/recipes-core/gettext/gettext_0.19.8.1.bb @@ -111,6 +111,10 @@ do_install_append_class-native () { rm ${D}${datadir}/gettext/config.rpath rm ${D}${datadir}/gettext/po/Makefile.in.in rm ${D}${datadir}/gettext/po/remove-potcdate.sin + + create_wrapper ${D}${bindir}/msgfmt \ + GETTEXTDATADIR="${STAGING_DATADIR_NATIVE}/gettext-0.19.8/" + } BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-kernel/sysprof/sysprof_3.24.1.bb b/meta/recipes-kernel/sysprof/sysprof_3.24.1.bb index 36093ca89f..168f2fdfba 100644 --- a/meta/recipes-kernel/sysprof/sysprof_3.24.1.bb +++ b/meta/recipes-kernel/sysprof/sysprof_3.24.1.bb @@ -20,10 +20,6 @@ AUTOTOOLS_AUXDIR = "${S}/build-aux" EXTRA_OECONF = "--enable-compile-warnings" -# This properly relocates msgfmt, which otherwise fails to find its data files. -# Tips on how to get rid of hardcoded version welcome. -export GETTEXTDATADIR = "${STAGING_DATADIR_NATIVE}/gettext-0.19.8/" - PACKAGECONFIG ?= "${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'gtk', '', d)}" PACKAGECONFIG[gtk] = "--enable-gtk,--disable-gtk,gtk+3" PACKAGECONFIG[polkit] = "--enable-polkit,--disable-polkit,polkit dbus" -- cgit v1.2.3