diff mbox series

[3/3] uninative-tarball: Add libjis and euc-jp gconv files

Message ID 20180511065249.40069-3-raj.khem@gmail.com
State Accepted
Commit b4f5ed7a8bb2f76ab4a50b3f0073a9d18a51923e
Headers show
Series [1/3] gcc-sanitizers: Package new liblsan objects built with gcc8 | expand

Commit Message

Khem Raj May 11, 2018, 6:52 a.m. UTC
packages like fontforge-native fail with mysterious errors like

| ../../git/inc/gwwiconv.h:44:21: error: conflicting types for ‘gww_iconv_close’
|  #define iconv_close gww_iconv_close
|                      ^~~~~~~~~~~~~~~
| ../../git/inc/gwwiconv.h:37:13: note: previous declaration of ‘gww_iconv_close’ was here
|  extern void gww_iconv_close( gww_iconv_t cd);
|              ^~~~~~~~~~~~~~~

The reason behind this is that a check for iconv fails during native
configure run, the check fails because the autoconf test to check for iconv
pokes for these gconv's in test runs before declaring iconv support successful.

Therefore when uninative is active the package fails to build but when
uninative is inactive all works fine. this patch fixes that

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/recipes-core/meta/uninative-tarball.bb | 2 ++
 1 file changed, 2 insertions(+)

Comments

Khem Raj May 23, 2018, 4:53 a.m. UTC | #1
Hi Ross/Richard

We need to regenerate uninative-tarball now this patch has landed in master.

On Fri, May 11, 2018 at 2:52 AM, Khem Raj <raj.khem@gmail.com> wrote:
> packages like fontforge-native fail with mysterious errors like
>
> | ../../git/inc/gwwiconv.h:44:21: error: conflicting types for ‘gww_iconv_close’
> |  #define iconv_close gww_iconv_close
> |                      ^~~~~~~~~~~~~~~
> | ../../git/inc/gwwiconv.h:37:13: note: previous declaration of ‘gww_iconv_close’ was here
> |  extern void gww_iconv_close( gww_iconv_t cd);
> |              ^~~~~~~~~~~~~~~
>
> The reason behind this is that a check for iconv fails during native
> configure run, the check fails because the autoconf test to check for iconv
> pokes for these gconv's in test runs before declaring iconv support successful.
>
> Therefore when uninative is active the package fails to build but when
> uninative is inactive all works fine. this patch fixes that
>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  meta/recipes-core/meta/uninative-tarball.bb | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/meta/recipes-core/meta/uninative-tarball.bb b/meta/recipes-core/meta/uninative-tarball.bb
> index 38c3a314e1..c38c2a445e 100644
> --- a/meta/recipes-core/meta/uninative-tarball.bb
> +++ b/meta/recipes-core/meta/uninative-tarball.bb
> @@ -12,6 +12,8 @@ TOOLCHAIN_HOST_TASK = "\
>      nativesdk-glibc-gconv-iso8859-1 \
>      nativesdk-glibc-gconv-utf-16 \
>      nativesdk-glibc-gconv-cp1252 \
> +    nativesdk-glibc-gconv-euc-jp \
> +    nativesdk-glibc-gconv-libjis \
>      nativesdk-patchelf \
>      nativesdk-libxcrypt \
>      "
> --
> 2.17.0
>
diff mbox series

Patch

diff --git a/meta/recipes-core/meta/uninative-tarball.bb b/meta/recipes-core/meta/uninative-tarball.bb
index 38c3a314e1..c38c2a445e 100644
--- a/meta/recipes-core/meta/uninative-tarball.bb
+++ b/meta/recipes-core/meta/uninative-tarball.bb
@@ -12,6 +12,8 @@  TOOLCHAIN_HOST_TASK = "\
     nativesdk-glibc-gconv-iso8859-1 \
     nativesdk-glibc-gconv-utf-16 \
     nativesdk-glibc-gconv-cp1252 \
+    nativesdk-glibc-gconv-euc-jp \
+    nativesdk-glibc-gconv-libjis \
     nativesdk-patchelf \
     nativesdk-libxcrypt \
     "