[morty][PATCH] systemtap: remove explicit msgfmt check

[morty][PATCH] systemtap: remove explicit msgfmt check

[Denys Dmytriyenko]

From: Ross Burton <ross.burton@intel.com>

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: Denys Dmytriyenko <denys@ti.com>
---
 .../systemtap/systemtap/no-msgfmt-check.patch             | 15 +++++++++++++++
 meta/recipes-kernel/systemtap/systemtap_git.inc           |  1 +
 2 files changed, 16 insertions(+)
 create mode 100644 meta/recipes-kernel/systemtap/systemtap/no-msgfmt-check.patch

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 0000000..471e62c
--- /dev/null
+++ b/meta/recipes-kernel/systemtap/systemtap/no-msgfmt-check.patch
@@ -0,0 +1,15 @@
+There is no need to explicitly check that msgfmt was found as the gettext macros
+handle this for us if NLS is enabled.
+
+Upstream-Status: Pending
+Signed-off-by: Ross Burton <ross.burton@intel.com>
+
+diff --git a/configure.ac b/configure.ac
+index e56079a..284bbe0 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -39,4 +38,0 @@ AM_GNU_GETTEXT_VERSION([0.19.4])
+-if test "x$GMSGFMT" = "x:"; then
+-   AC_MSG_ERROR([missing gnu /usr/bin/msgfmt])
+-fi
+-
diff --git a/meta/recipes-kernel/systemtap/systemtap_git.inc b/meta/recipes-kernel/systemtap/systemtap_git.inc
index 304eb99..34cf227 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 \
            file://configure-allow-to-disable-libvirt.patch \
            file://x32_abi_time.patch \
            file://monitor-option.patch \
+           file://no-msgfmt-check.patch \
           "
 
 # systemtap doesn't support mips
-- 
2.7.4

Re: [morty][PATCH] systemtap: remove explicit msgfmt check

[Denys Dmytriyenko]

Ping.

On Thu, Dec 22, 2016 at 03:19:00PM -0500, Denys Dmytriyenko wrote:
> From: Ross Burton <ross.burton@intel.com>
> 
> 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: Denys Dmytriyenko <denys@ti.com>
> ---
>  .../systemtap/systemtap/no-msgfmt-check.patch             | 15 +++++++++++++++
>  meta/recipes-kernel/systemtap/systemtap_git.inc           |  1 +
>  2 files changed, 16 insertions(+)
>  create mode 100644 meta/recipes-kernel/systemtap/systemtap/no-msgfmt-check.patch
> 
> 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 0000000..471e62c
> --- /dev/null
> +++ b/meta/recipes-kernel/systemtap/systemtap/no-msgfmt-check.patch
> @@ -0,0 +1,15 @@
> +There is no need to explicitly check that msgfmt was found as the gettext macros
> +handle this for us if NLS is enabled.
> +
> +Upstream-Status: Pending
> +Signed-off-by: Ross Burton <ross.burton@intel.com>
> +
> +diff --git a/configure.ac b/configure.ac
> +index e56079a..284bbe0 100644
> +--- a/configure.ac
> ++++ b/configure.ac
> +@@ -39,4 +38,0 @@ AM_GNU_GETTEXT_VERSION([0.19.4])
> +-if test "x$GMSGFMT" = "x:"; then
> +-   AC_MSG_ERROR([missing gnu /usr/bin/msgfmt])
> +-fi
> +-
> diff --git a/meta/recipes-kernel/systemtap/systemtap_git.inc b/meta/recipes-kernel/systemtap/systemtap_git.inc
> index 304eb99..34cf227 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 \
>             file://configure-allow-to-disable-libvirt.patch \
>             file://x32_abi_time.patch \
>             file://monitor-option.patch \
> +           file://no-msgfmt-check.patch \
>            "
>  
>  # systemtap doesn't support mips
> -- 
> 2.7.4
> 
> -- 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core