Patchwork gettext: fix implicit build result

login
register
mail settings
Submitter rongqing.li@windriver.com
Date Aug. 20, 2014, 8:06 a.m.
Message ID <1408521993-10848-1-git-send-email-rongqing.li@windriver.com>
Download mbox | patch
Permalink /patch/78661/
State New
Headers show

Comments

rongqing.li@windriver.com - Aug. 20, 2014, 8:06 a.m.
From: Ming Liu <ming.liu@windriver.com>

Some "once only" variants are being defined instead of standard autoconf
macros, for instance, AC_CHECK_HEADERS_ONCE like AC_CHECK_HEADERS. The
advantage is that the check for each of the headers will be put only once
into the 'configure' file, therefore it keeps the size down. But there is
also a drawback that the checks then will turn to be statically inserted
to the configure and cannot be conditionalized any more. It will
definitely break the dependencies chosen as internally included.

Turns AC_CHECK_HEADERS_ONCE back to AC_CHECK_HEADERS for those cases.

Signed-off-by: Ming Liu <ming.liu@windriver.com>
---
 .../fix-absolute-header-macro.patch                |   28 ++++++++++++++++++++
 meta/recipes-core/gettext/gettext_0.18.3.2.bb      |    3 ++-
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-core/gettext/gettext-0.18.3.2/fix-absolute-header-macro.patch

Patch

diff --git a/meta/recipes-core/gettext/gettext-0.18.3.2/fix-absolute-header-macro.patch b/meta/recipes-core/gettext/gettext-0.18.3.2/fix-absolute-header-macro.patch
new file mode 100644
index 0000000..7b6935f
--- /dev/null
+++ b/meta/recipes-core/gettext/gettext-0.18.3.2/fix-absolute-header-macro.patch
@@ -0,0 +1,28 @@ 
+Upstream-Status: Inappropriate [embedded specific]
+
+Some "once only" variants are being defined instead of standard autoconf
+macros, for instance, AC_CHECK_HEADERS_ONCE like AC_CHECK_HEADERS. The
+advantage is that the check for each of the headers will be put only once
+into the 'configure' file, therefore it keeps the size down. But there is
+also a drawback that the checks then will turn to be statically inserted
+to the configure and cannot be conditionalized any more. It will
+definitely break the dependencies chosen as internally included.
+
+Turns AC_CHECK_HEADERS_ONCE back to AC_CHECK_HEADERS for those cases.
+
+Signed-off-by: Ming Liu <ming.liu@windriver.com>
+---
+ absolute-header.m4 |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/gettext-tools/gnulib-m4/absolute-header.m4
++++ b/gettext-tools/gnulib-m4/absolute-header.m4
+@@ -29,7 +29,7 @@ m4_foreach_w([gl_HEADER_NAME], [$1],
+     m4_defn([gl_absolute_header]),
+     [AS_VAR_PUSHDEF([ac_header_exists],
+                     [ac_cv_header_]m4_defn([gl_HEADER_NAME]))dnl
+-    AC_CHECK_HEADERS_ONCE(m4_defn([gl_HEADER_NAME]))dnl
++    AC_CHECK_HEADERS(m4_defn([gl_HEADER_NAME]))dnl
+     if test AS_VAR_GET(ac_header_exists) = yes; then
+       gl_ABSOLUTE_HEADER_ONE(m4_defn([gl_HEADER_NAME]))
+     fi
diff --git a/meta/recipes-core/gettext/gettext_0.18.3.2.bb b/meta/recipes-core/gettext/gettext_0.18.3.2.bb
index 65d4103..9375e86 100644
--- a/meta/recipes-core/gettext/gettext_0.18.3.2.bb
+++ b/meta/recipes-core/gettext/gettext_0.18.3.2.bb
@@ -11,7 +11,8 @@  PROVIDES = "virtual/libintl virtual/gettext"
 PROVIDES_class-native = "virtual/gettext-native"
 RCONFLICTS_${PN} = "proxy-libintl"
 SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
-	   file://parallel.patch \
+           file://parallel.patch \
+           file://fix-absolute-header-macro.patch \
           "
 
 PACKAGECONFIG[msgcat-curses] = "--with-libncurses-prefix=${STAGING_LIBDIR}/..,--disable-curses,ncurses,"