diff options
| author | Khem Raj <raj.khem@gmail.com> | 2016-05-11 10:35:10 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-13 13:40:51 +0100 |
| commit | aaab0e290ec7c4fb09a46a15d72d6aec6dedc832 (patch) | |
| tree | 47a15ff6d2153f3bd76660ec167d53c85d25326c /meta/recipes-support | |
| parent | 912782db29cfc15dae2e19e79fa974e11b83f297 (diff) | |
| download | openembedded-core-aaab0e290ec7c4fb09a46a15d72d6aec6dedc832.tar.gz openembedded-core-aaab0e290ec7c4fb09a46a15d72d6aec6dedc832.tar.bz2 openembedded-core-aaab0e290ec7c4fb09a46a15d72d6aec6dedc832.zip | |
lzop: Fix build with gcc-6
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
| -rw-r--r-- | meta/recipes-support/lzop/lzop/lzop-1.03-gcc6.patch | 37 | ||||
| -rw-r--r-- | meta/recipes-support/lzop/lzop_1.03.bb | 6 |
2 files changed, 40 insertions, 3 deletions
diff --git a/meta/recipes-support/lzop/lzop/lzop-1.03-gcc6.patch b/meta/recipes-support/lzop/lzop/lzop-1.03-gcc6.patch new file mode 100644 index 0000000000..72b33970e2 --- /dev/null +++ b/meta/recipes-support/lzop/lzop/lzop-1.03-gcc6.patch @@ -0,0 +1,37 @@ +gcc-6 has additional errors e.g. + +./test.c:1:12: error: variably modified '__acc_cta' at file scope + extern int __acc_cta[1-2*!((1l << (8*8 -1)) < 0)]; + ^~~~~~~~~ + +This is rightly pointed out since that index is undefined + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Pending + +--- a/src/miniacc.h.orig 2016-02-10 16:09:23.247315866 +0100 ++++ a/src/miniacc.h 2016-02-10 16:12:14.973297054 +0100 +@@ -4469,12 +4469,12 @@ + #if defined(__MSDOS__) && defined(__TURBOC__) && (__TURBOC__ < 0x0150) + #elif 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC) + #else +- ACCCHK_ASSERT((1 << (8*SIZEOF_INT-1)) < 0) ++ ACCCHK_ASSERT((int)(1u << (8*SIZEOF_INT-1)) < 0) + #endif + ACCCHK_ASSERT((1u << (8*SIZEOF_INT-1)) > 0) + #if 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC) + #else +- ACCCHK_ASSERT((1l << (8*SIZEOF_LONG-1)) < 0) ++ ACCCHK_ASSERT((long)(1ul << (8*SIZEOF_LONG-1)) < 0) + #endif + ACCCHK_ASSERT((1ul << (8*SIZEOF_LONG-1)) > 0) + #if defined(acc_int16e_t) +@@ -4703,7 +4703,7 @@ + #elif 1 && (ACC_CC_LCC || ACC_CC_LCCWIN32) && !defined(ACCCHK_CFG_PEDANTIC) + #elif 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC) + #elif !(ACC_BROKEN_INTEGRAL_PROMOTION) && (SIZEOF_INT > 1) +- ACCCHK_ASSERT( (((unsigned char)128) << (int)(8*sizeof(int)-8)) < 0) ++ ACCCHK_ASSERT( (int)((unsigned int)((unsigned char)128) << (int)(8*sizeof(int)-8)) < 0) + #endif + #if (ACC_CC_BORLANDC && (__BORLANDC__ >= 0x0530) && (__BORLANDC__ < 0x0560)) + # pragma option pop diff --git a/meta/recipes-support/lzop/lzop_1.03.bb b/meta/recipes-support/lzop/lzop_1.03.bb index 07d628908a..649e7243ee 100644 --- a/meta/recipes-support/lzop/lzop_1.03.bb +++ b/meta/recipes-support/lzop/lzop_1.03.bb @@ -15,15 +15,15 @@ SRC_URI = "http://www.lzop.org/download/${BP}.tar.gz \ file://acinclude.m4 \ file://x32_abi_miniacc_h.patch \ file://0001-use-static-inlines-as-the-external-inline-definition.patch \ + file://lzop-1.03-gcc6.patch \ " SRC_URI[md5sum] = "006c5e27fb78cdd14a628fdfa5aa1905" SRC_URI[sha256sum] = "c1425b8c77d49f5a679d5a126c90ea6ad99585a55e335a613cae59e909dbb2c9" inherit autotools -do_configure () { - ln -sf ../acinclude.m4 ${S}/acinclude.m4 - autotools_do_configure +do_configure_prepend () { + install -Dm 0644 ${WORKDIR}/acinclude.m4 ${S}/acinclude.m4 } BBCLASSEXTEND += "native nativesdk" |