gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

app-arch/lzop: Fix building with GCC-6

Browse Source 
Bug: https://bugs.gentoo.org/594472
Closes: https://github.com/gentoo/gentoo/pull/4699
Package-Manager: Portage-2.3.5, Repoman-2.3.2
This commit is contained in:
Peter Levine
2017-05-21 01:35:17 -04:00
committed by Michał Górny
parent 4cd63a6d30
commit 81b65c4b69
2 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app-arch/lzop/files/lzop-1.03-gcc6.patch Normal file
View File

@@ -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

6
app-arch/lzop/lzop-1.03.ebuild
View File

@@ -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
}