commit: 81b65c4b69c23407dc5dd1b023539d2eb3b7add4 Author: Peter Levine <plevine457 <AT> gmail <DOT> com> AuthorDate: Sun May 21 05:35:17 2017 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sun May 21 21:53:21 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81b65c4b
app-arch/lzop: Fix building with GCC-6 Bug: https://bugs.gentoo.org/594472 Closes: https://github.com/gentoo/gentoo/pull/4699 Package-Manager: Portage-2.3.5, Repoman-2.3.2 app-arch/lzop/files/lzop-1.03-gcc6.patch | 26 ++++++++++++++++++++++++++ app-arch/lzop/lzop-1.03.ebuild | 6 ++++-- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/app-arch/lzop/files/lzop-1.03-gcc6.patch b/app-arch/lzop/files/lzop-1.03-gcc6.patch new file mode 100644 index 00000000000..0826bc1f521 --- /dev/null +++ b/app-arch/lzop/files/lzop-1.03-gcc6.patch @@ -0,0 +1,26 @@ +--- a/src/miniacc.h ++++ b/src/miniacc.h +@@ -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/app-arch/lzop/lzop-1.03.ebuild b/app-arch/lzop/lzop-1.03.ebuild index 1416bab8ac2..ad00dfc6053 100644 --- a/app-arch/lzop/lzop-1.03.ebuild +++ b/app-arch/lzop/lzop-1.03.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -17,8 +17,11 @@ DEPEND="${RDEPEND}" PATCHES=( "${FILESDIR}"/${P}-x32.patch #575450 + "${FILESDIR}"/${P}-gcc6.patch #594472 ) +HTML_DOCS=( doc/lzop.html ) + src_test() { einfo "compressing config.status to test" src/lzop config.status || die 'compression failed' @@ -30,5 +33,4 @@ src_test() { src_install() { default dodoc doc/lzop.{txt,ps} - dohtml doc/*.html }
