[PATCH 1/3] gcc-sanitizers: Package new liblsan objects built with gcc8

[PATCH 1/3] gcc-sanitizers: Package new liblsan objects built with gcc8

[Khem Raj]

Fixes installed-vs-shipped QA errors

Reported-by: Dan McGregor <danismostlikely@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/recipes-devtools/gcc/gcc-sanitizers.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/recipes-devtools/gcc/gcc-sanitizers.inc b/meta/recipes-devtools/gcc/gcc-sanitizers.inc
index 3b7e0028f2..e5e84526fa 100644
--- a/meta/recipes-devtools/gcc/gcc-sanitizers.inc
+++ b/meta/recipes-devtools/gcc/gcc-sanitizers.inc
@@ -94,6 +94,7 @@ FILES_liblsan += "${libdir}/liblsan.so.*"
 FILES_liblsan-dev += "\
     ${libdir}/liblsan.so \
     ${libdir}/liblsan.la \
+    ${libdir}/liblsan_preinit.o \
 "
 FILES_liblsan-staticdev += "${libdir}/liblsan.a"
 
-- 
2.17.0

[PATCH 2/3] libxcrypt: Fix build with gcc8

[Khem Raj]

Reported-by: Martin Jansa <martin.jansa@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...format-truncation-warning-with-gcc-8.patch | 36 +++++++++++++++++++
 .../recipes-core/libxcrypt/libxcrypt_4.0.0.bb |  4 ++-
 2 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-core/libxcrypt/libxcrypt/0001-disable-format-truncation-warning-with-gcc-8.patch

diff --git a/meta/recipes-core/libxcrypt/libxcrypt/0001-disable-format-truncation-warning-with-gcc-8.patch b/meta/recipes-core/libxcrypt/libxcrypt/0001-disable-format-truncation-warning-with-gcc-8.patch
new file mode 100644
index 0000000000..654eae6c6a
--- /dev/null
+++ b/meta/recipes-core/libxcrypt/libxcrypt/0001-disable-format-truncation-warning-with-gcc-8.patch
@@ -0,0 +1,36 @@
+From c8c5908611e44a649489e8d217528fedc4864e14 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Thu, 10 May 2018 13:32:20 -0700
+Subject: [PATCH] disable format-truncation warning with gcc-8
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ crypt-sunmd5.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/crypt-sunmd5.c b/crypt-sunmd5.c
+index 4c85b7f..3e838cd 100644
+--- a/crypt-sunmd5.c
++++ b/crypt-sunmd5.c
+@@ -151,6 +151,11 @@ getrounds (const char *s)
+   return ((uint32_t)val);
+ }
+ 
++#pragma GCC diagnostic push
++#if defined(__GNUC__) && (__GNUC__ >= 8)
++#pragma GCC diagnostic ignored "-Wformat-truncation"
++#endif
++
+ void
+ gensalt_sunmd5_rn (unsigned long count,
+                    const uint8_t *rbytes, size_t nrbytes,
+@@ -189,6 +194,7 @@ gensalt_sunmd5_rn (unsigned long count,
+             "$" CRYPT_ALGNAME "," ROUNDS "%u$%s$",
+             (unsigned int)count, rndstr);
+ }
++#pragma GCC diagnostic pop
+ 
+ void
+ crypt_sunmd5_rn (const char *phrase, const char *setting,
diff --git a/meta/recipes-core/libxcrypt/libxcrypt_4.0.0.bb b/meta/recipes-core/libxcrypt/libxcrypt_4.0.0.bb
index a1be4be7ef..8cc5edac49 100644
--- a/meta/recipes-core/libxcrypt/libxcrypt_4.0.0.bb
+++ b/meta/recipes-core/libxcrypt/libxcrypt_4.0.0.bb
@@ -12,7 +12,9 @@ inherit autotools
 SRCREV ?= "215b32aa4e0b255c3356a96bd6d257661bad73ca"
 SRCBRANCH ?= "master"
 
-SRC_URI = "git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH}"
+SRC_URI = "git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH} \
+           file://0001-disable-format-truncation-warning-with-gcc-8.patch \
+           "
 
 PROVIDES = "virtual/crypt"
 
-- 
2.17.0

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

[Khem Raj]

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

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

[Khem Raj]

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
>

Re: [PATCH 1/3] gcc-sanitizers: Package new liblsan objects built with gcc8

[Dan McGregor]

On 11 May 2018 at 00:52, Khem Raj <raj.khem@gmail.com> wrote:
> Fixes installed-vs-shipped QA errors
>
> Reported-by: Dan McGregor <danismostlikely@gmail.com>

The email address I typically use in my git submissions is
dan.mcgregor@usask.ca. The gmail address is what I use only for
mailing lists.

> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  meta/recipes-devtools/gcc/gcc-sanitizers.inc | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/meta/recipes-devtools/gcc/gcc-sanitizers.inc b/meta/recipes-devtools/gcc/gcc-sanitizers.inc
> index 3b7e0028f2..e5e84526fa 100644
> --- a/meta/recipes-devtools/gcc/gcc-sanitizers.inc
> +++ b/meta/recipes-devtools/gcc/gcc-sanitizers.inc
> @@ -94,6 +94,7 @@ FILES_liblsan += "${libdir}/liblsan.so.*"
>  FILES_liblsan-dev += "\
>      ${libdir}/liblsan.so \
>      ${libdir}/liblsan.la \
> +    ${libdir}/liblsan_preinit.o \
>  "

This looks good.

>  FILES_liblsan-staticdev += "${libdir}/liblsan.a"
>
> --
> 2.17.0
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core