Control: tag -1 + patch Hi,
I found the attached patch from the OpenEmbedded project, which fixes the FTBFS of lzop. I confirmed that it also still compiles with gcc5. Kind regards, Reiner
diff --git a/debian/patches/lzop-1.03-gcc6.patch b/debian/patches/lzop-1.03-gcc6.patch new file mode 100644 index 0000000..5f599bb --- /dev/null +++ b/debian/patches/lzop-1.03-gcc6.patch @@ -0,0 +1,39 @@ +Origin: vendor, https://github.com/openembedded/openembedded-core/blob/master/meta/recipes-support/lzop/lzop/lzop-1.03-gcc6.patch +Description: Compatibility with gcc6 + 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.k...@gmail.com> +Upstream-Status: Pending +Bug-Debian: https://bugs.debian.org/812054 + +--- a/src/miniacc.h ++++ b/src/miniacc.h +@@ -4461,12 +4461,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) +@@ -4695,7 +4695,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/debian/patches/series b/debian/patches/series index d2bbf59..02df4cb 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ static-inlines.patch +lzop-1.03-gcc6.patch
signature.asc
Description: Digital signature
