summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2017-06-16 14:37:33 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-06-28 15:52:18 +0100
commitd5d7b49cc5515ad4cee03b52e5af6d3f611c0cee (patch)
tree3c0dcf04f6205c597187d739fc44877d7bdfb508
parent64bf080489a1eea6895454efb1ba1927d6b43865 (diff)
downloadpoky-d5d7b49cc5515ad4cee03b52e5af6d3f611c0cee.tar.gz
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. (From OE-Core rev: 7c0032b81f56fea5bec33aa0e74d6e28873f72a8) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/gettext/gettext_0.19.8.1.bb4
-rw-r--r--meta/recipes-kernel/sysprof/sysprof_3.24.1.bb4
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 () {
111 rm ${D}${datadir}/gettext/config.rpath 111 rm ${D}${datadir}/gettext/config.rpath
112 rm ${D}${datadir}/gettext/po/Makefile.in.in 112 rm ${D}${datadir}/gettext/po/Makefile.in.in
113 rm ${D}${datadir}/gettext/po/remove-potcdate.sin 113 rm ${D}${datadir}/gettext/po/remove-potcdate.sin
114
115 create_wrapper ${D}${bindir}/msgfmt \
116 GETTEXTDATADIR="${STAGING_DATADIR_NATIVE}/gettext-0.19.8/"
117
114} 118}
115 119
116BBCLASSEXTEND = "native nativesdk" 120BBCLASSEXTEND = "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"
20 20
21EXTRA_OECONF = "--enable-compile-warnings" 21EXTRA_OECONF = "--enable-compile-warnings"
22 22
23# This properly relocates msgfmt, which otherwise fails to find its data files.
24# Tips on how to get rid of hardcoded version welcome.
25export GETTEXTDATADIR = "${STAGING_DATADIR_NATIVE}/gettext-0.19.8/"
26
27PACKAGECONFIG ?= "${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'gtk', '', d)}" 23PACKAGECONFIG ?= "${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'gtk', '', d)}"
28PACKAGECONFIG[gtk] = "--enable-gtk,--disable-gtk,gtk+3" 24PACKAGECONFIG[gtk] = "--enable-gtk,--disable-gtk,gtk+3"
29PACKAGECONFIG[polkit] = "--enable-polkit,--disable-polkit,polkit dbus" 25PACKAGECONFIG[polkit] = "--enable-polkit,--disable-polkit,polkit dbus"