diff options
author | Ross Burton <ross.burton@intel.com> | 2016-11-08 23:07:41 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-11-15 15:19:54 +0000 |
commit | ebabbfd4303c8ce39c07bda9e715e26e78c37268 (patch) | |
tree | 5273dbe01b3b0e800dcbe9d33bf2d63590f8d0b4 | |
parent | e6b59a1ac46ffad01e7c98c796148b0e12a5a0f2 (diff) | |
download | poky-ebabbfd4303c8ce39c07bda9e715e26e78c37268.tar.gz |
systemtap: remove explicit msgfmt check
Passing --disable-nls should be enough to disable the requirement for a full
gettext to be present, but the upstream configure explicitly checks for msgfmt
even if it isn't going to be used. To avoid having to depend on gettext-native,
patch this check out.
(From OE-Core rev: 2f8d2a74f73490c1ae35131d3eb3592f7ee0a1e4)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-kernel/systemtap/systemtap/no-msgfmt-check.patch | 15 | ||||
-rw-r--r-- | meta/recipes-kernel/systemtap/systemtap_git.inc | 1 |
2 files changed, 16 insertions, 0 deletions
diff --git a/meta/recipes-kernel/systemtap/systemtap/no-msgfmt-check.patch b/meta/recipes-kernel/systemtap/systemtap/no-msgfmt-check.patch new file mode 100644 index 0000000000..471e62c56b --- /dev/null +++ b/meta/recipes-kernel/systemtap/systemtap/no-msgfmt-check.patch | |||
@@ -0,0 +1,15 @@ | |||
1 | There is no need to explicitly check that msgfmt was found as the gettext macros | ||
2 | handle this for us if NLS is enabled. | ||
3 | |||
4 | Upstream-Status: Pending | ||
5 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
6 | |||
7 | diff --git a/configure.ac b/configure.ac | ||
8 | index e56079a..284bbe0 100644 | ||
9 | --- a/configure.ac | ||
10 | +++ b/configure.ac | ||
11 | @@ -39,4 +38,0 @@ AM_GNU_GETTEXT_VERSION([0.19.4]) | ||
12 | -if test "x$GMSGFMT" = "x:"; then | ||
13 | - AC_MSG_ERROR([missing gnu /usr/bin/msgfmt]) | ||
14 | -fi | ||
15 | - | ||
diff --git a/meta/recipes-kernel/systemtap/systemtap_git.inc b/meta/recipes-kernel/systemtap/systemtap_git.inc index 304eb99750..34cf22749f 100644 --- a/meta/recipes-kernel/systemtap/systemtap_git.inc +++ b/meta/recipes-kernel/systemtap/systemtap_git.inc | |||
@@ -9,6 +9,7 @@ SRC_URI = "git://sourceware.org/git/systemtap.git \ | |||
9 | file://configure-allow-to-disable-libvirt.patch \ | 9 | file://configure-allow-to-disable-libvirt.patch \ |
10 | file://x32_abi_time.patch \ | 10 | file://x32_abi_time.patch \ |
11 | file://monitor-option.patch \ | 11 | file://monitor-option.patch \ |
12 | file://no-msgfmt-check.patch \ | ||
12 | " | 13 | " |
13 | 14 | ||
14 | # systemtap doesn't support mips | 15 | # systemtap doesn't support mips |