summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2015-05-29 21:57:35 +0000
committerSergei Trofimovich <slyfox@gentoo.org>2015-05-29 21:57:35 +0000
commitdf8981e555fe1b395cf0ed7815c022c6f4d41724 (patch)
treeec041a8660c4b7a50fdedef26a1160d704842c83 /app-i18n/enca
parentRemove old. (diff)
downloadgentoo-2-df8981e555fe1b395cf0ed7815c022c6f4d41724.tar.gz
gentoo-2-df8981e555fe1b395cf0ed7815c022c6f4d41724.tar.bz2
gentoo-2-df8981e555fe1b395cf0ed7815c022c6f4d41724.zip
Workaround gcc-4.8 AVX bug #501386 by Thomas Capricelli and friends.
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA)
Diffstat (limited to 'app-i18n/enca')
-rw-r--r--app-i18n/enca/ChangeLog6
-rw-r--r--app-i18n/enca/enca-1.14-r2.ebuild7
-rw-r--r--app-i18n/enca/files/enca-1.14-gcc4.8-avx-bug.patch15
3 files changed, 24 insertions, 4 deletions
diff --git a/app-i18n/enca/ChangeLog b/app-i18n/enca/ChangeLog
index 9aa487b65cd9..eaa61480a26b 100644
--- a/app-i18n/enca/ChangeLog
+++ b/app-i18n/enca/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-i18n/enca
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/enca/ChangeLog,v 1.110 2015/03/02 10:19:59 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/enca/ChangeLog,v 1.111 2015/05/29 21:57:35 slyfox Exp $
+
+ 29 May 2015; Sergei Trofimovich <slyfox@gentoo.org>
+ +files/enca-1.14-gcc4.8-avx-bug.patch, enca-1.14-r2.ebuild:
+ Workaround gcc-4.8 AVX bug #501386 by Thomas Capricelli and friends.
02 Mar 2015; Yixun Lan <dlan@gentoo.org> enca-1.14-r2.ebuild:
add arm64 support, tested on A53 board
diff --git a/app-i18n/enca/enca-1.14-r2.ebuild b/app-i18n/enca/enca-1.14-r2.ebuild
index 7d71a732b046..af0689eb1074 100644
--- a/app-i18n/enca/enca-1.14-r2.ebuild
+++ b/app-i18n/enca/enca-1.14-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/enca/enca-1.14-r2.ebuild,v 1.8 2015/03/02 10:19:59 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/enca/enca-1.14-r2.ebuild,v 1.9 2015/05/29 21:57:35 slyfox Exp $
EAPI=5
@@ -22,8 +22,9 @@ DEPEND="${RDEPEND}
sys-devel/gettext"
src_prepare() {
- epatch "${FILESDIR}"/${PN}-remove-dirty-path-hack.patch\
- "${FILESDIR}"/${P}-automake-1.13.patch
+ epatch "${FILESDIR}"/${PN}-remove-dirty-path-hack.patch \
+ "${FILESDIR}"/${P}-automake-1.13.patch \
+ "${FILESDIR}"/${P}-gcc4.8-avx-bug.patch
rm missing # too old, automake will update it
# fix crosscompilation, bug #424473
if tc-is-cross-compiler; then
diff --git a/app-i18n/enca/files/enca-1.14-gcc4.8-avx-bug.patch b/app-i18n/enca/files/enca-1.14-gcc4.8-avx-bug.patch
new file mode 100644
index 000000000000..3753c73acc98
--- /dev/null
+++ b/app-i18n/enca/files/enca-1.14-gcc4.8-avx-bug.patch
@@ -0,0 +1,15 @@
+Avoid gcc-4.8.4 bug when built with -O3 -march=core-avx2
+https://bugs.gentoo.org/501386
+diff --git a/lib/multibyte.c b/lib/multibyte.c
+index d0d0680..d511f88 100644
+--- a/lib/multibyte.c
++++ b/lib/multibyte.c
+@@ -520,7 +520,7 @@ looks_like_ucs2(EncaAnalyserState *analyser)
+ static int
+ looks_like_ucs4(EncaAnalyserState *analyser)
+ {
+- static const EncaSurface PERMS[] = {
++ /*static*/ const EncaSurface PERMS[] = {
+ ENCA_SURFACE_PERM_4321,
+ ENCA_SURFACE_PERM_21
+ };