Append no-avx to fix segmentation fault.

(Portage version: 2.2.0_alpha47/cvs/Linux x86_64)

3 files changed, 214 insertions, 2 deletions

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 7a8987545649..0b0fa4c0016c 100644
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/libreoffice
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.79 2011/07/31 16:03:50 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.80 2011/08/01 15:51:36 scarabeus Exp $
+
+  01 Aug 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  libreoffice-3.4.2.3.ebuild, +files/libreoffice-append-no-avx.patch:
+  Append no-avx to fix segmentation fault.
 
   31 Jul 2011; Matt Turner <mattst88@gentoo.org> libreoffice-3.4.9999.ebuild:
   Remove seemingly unnecessary fonts from -3.4.9999 also.
diff --git a/app-office/libreoffice/files/libreoffice-append-no-avx.patch b/app-office/libreoffice/files/libreoffice-append-no-avx.patch
new file mode 100644
index 000000000000..693d49a632b9
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-append-no-avx.patch
@@ -0,0 +1,207 @@
+From 7424b4357b24736ddad75e2449839bf0ecc8e09b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tomas.chvatal@gmail.com>
+Date: Mon, 1 Aug 2011 17:41:29 +0200
+Subject: [PATCH] Fix segmentation fault when linking -mavx on new CPUs is enabled by explicitly adding -mno-avx to CXXFLAGS.
+
+---
+ .../source/cpp_uno/gcc3_linux_alpha/makefile.mk    |    2 +-
+ bridges/source/cpp_uno/gcc3_linux_arm/makefile.mk  |    2 +-
+ bridges/source/cpp_uno/gcc3_linux_hppa/makefile.mk |    2 +-
+ bridges/source/cpp_uno/gcc3_linux_ia64/makefile.mk |    2 +-
+ .../source/cpp_uno/gcc3_linux_intel/makefile.mk    |    2 +-
+ bridges/source/cpp_uno/gcc3_linux_m68k/makefile.mk |    2 +-
+ bridges/source/cpp_uno/gcc3_linux_mips/makefile.mk |    2 +-
+ .../source/cpp_uno/gcc3_linux_powerpc/makefile.mk  |    2 +-
+ .../cpp_uno/gcc3_linux_powerpc64/makefile.mk       |    2 +-
+ bridges/source/cpp_uno/gcc3_linux_s390/makefile.mk |    2 +-
+ .../source/cpp_uno/gcc3_linux_s390x/makefile.mk    |    2 +-
+ .../source/cpp_uno/gcc3_linux_sparc/makefile.mk    |    2 +-
+ .../source/cpp_uno/gcc3_linux_x86-64/makefile.mk   |    2 +-
+ bridges/source/cpp_uno/mingw_intel/makefile.mk     |    2 +-
+ 14 files changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/bridges/source/cpp_uno/gcc3_linux_alpha/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_alpha/makefile.mk
+index 5376b39..dabd2dc 100644
+--- a/bridges/source/cpp_uno/gcc3_linux_alpha/makefile.mk
++++ b/bridges/source/cpp_uno/gcc3_linux_alpha/makefile.mk
+@@ -46,7 +46,7 @@ CFLAGS += -DLEAK_STATIC_DATA
+ 
+ # In case someone enabled the non-standard -fomit-frame-pointer which does not
+ # work with the .cxx sources in this directory:
+-CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing
++CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing -mno-avx
+ 
+ CFLAGSNOOPT=-O0
+ 
+diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_arm/makefile.mk
+index 2c42dec..92cad3a 100644
+--- a/bridges/source/cpp_uno/gcc3_linux_arm/makefile.mk
++++ b/bridges/source/cpp_uno/gcc3_linux_arm/makefile.mk
+@@ -45,7 +45,7 @@ NO_BSYMBOLIC=TRUE
+ CFLAGS += -DLEAK_STATIC_DATA
+ .ENDIF
+ 
+-CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing
++CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing -mno-avx
+ 
+ NOOPTFILES= \
+     $(SLO)$/cpp2uno.obj \
+diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_hppa/makefile.mk
+index 6fab7a4..a7c2824 100644
+--- a/bridges/source/cpp_uno/gcc3_linux_hppa/makefile.mk
++++ b/bridges/source/cpp_uno/gcc3_linux_hppa/makefile.mk
+@@ -45,7 +45,7 @@ NO_BSYMBOLIC=TRUE
+ CFLAGS += -DLEAK_STATIC_DATA
+ .ENDIF
+ 
+-CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing
++CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing -mno-avx
+ 
+ NOOPTFILES= \
+     $(SLO)$/cpp2uno.obj \
+diff --git a/bridges/source/cpp_uno/gcc3_linux_ia64/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_ia64/makefile.mk
+index 1e82cfa..667ffd6 100644
+--- a/bridges/source/cpp_uno/gcc3_linux_ia64/makefile.mk
++++ b/bridges/source/cpp_uno/gcc3_linux_ia64/makefile.mk
+@@ -46,7 +46,7 @@ CFLAGS += -DLEAK_STATIC_DATA
+ 
+ # In case someone enabled the non-standard -fomit-frame-pointer which does not
+ # work with the .cxx sources in this directory:
+-CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing
++CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing -mno-avx
+ 
+ NOOPTFILES= \
+     $(SLO)$/uno2cpp.obj \
+diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk
+index beedf9d..eae6df4 100644
+--- a/bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk
++++ b/bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk
+@@ -50,7 +50,7 @@ CFLAGS += -DLEAK_STATIC_DATA
+ 
+ # In case someone enabled the non-standard -fomit-frame-pointer which does not
+ # work with the .cxx sources in this directory:
+-CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing
++CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing -mno-avx
+ 
+ CFLAGSNOOPT=-O0
+ 
+diff --git a/bridges/source/cpp_uno/gcc3_linux_m68k/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_m68k/makefile.mk
+index 3978bda..bf04770 100644
+--- a/bridges/source/cpp_uno/gcc3_linux_m68k/makefile.mk
++++ b/bridges/source/cpp_uno/gcc3_linux_m68k/makefile.mk
+@@ -45,7 +45,7 @@ NO_BSYMBOLIC=TRUE
+ CFLAGS += -DLEAK_STATIC_DATA
+ .ENDIF
+ 
+-CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing
++CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing -mno-avx
+ 
+ NOOPTFILES= \
+     $(SLO)$/cpp2uno.obj \
+diff --git a/bridges/source/cpp_uno/gcc3_linux_mips/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_mips/makefile.mk
+index f71750e..c7ca5f9 100644
+--- a/bridges/source/cpp_uno/gcc3_linux_mips/makefile.mk
++++ b/bridges/source/cpp_uno/gcc3_linux_mips/makefile.mk
+@@ -46,7 +46,7 @@ CFLAGS += -DLEAK_STATIC_DATA
+ 
+ # In case someone enabled the non-standard -fomit-frame-pointer which does not
+ # work with the .cxx sources in this directory:
+-CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing
++CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing -mno-avx
+ 
+ CFLAGSNOOPT=-O0
+ 
+diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_powerpc/makefile.mk
+index 9a75200..3b86ee7 100644
+--- a/bridges/source/cpp_uno/gcc3_linux_powerpc/makefile.mk
++++ b/bridges/source/cpp_uno/gcc3_linux_powerpc/makefile.mk
+@@ -45,7 +45,7 @@ CFLAGS += -DLEAK_STATIC_DATA
+ 
+ # In case someone enabled the non-standard -fomit-frame-pointer which does not
+ # work with the .cxx sources in this directory:
+-CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing
++CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing -mno-avx
+ 
+ NOOPTFILES= \
+     $(SLO)$/uno2cpp.obj
+diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_powerpc64/makefile.mk
+index 77763d7..b21194c 100644
+--- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/makefile.mk
++++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/makefile.mk
+@@ -46,7 +46,7 @@ CFLAGS += -DLEAK_STATIC_DATA
+ 
+ # In case someone enabled the non-standard -fomit-frame-pointer which does not
+ # work with the .cxx sources in this directory:
+-CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing
++CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing -mno-avx
+ 
+ NOOPTFILES= \
+     $(SLO)$/uno2cpp.obj \
+diff --git a/bridges/source/cpp_uno/gcc3_linux_s390/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_s390/makefile.mk
+index bda85f3..0f40c1c 100644
+--- a/bridges/source/cpp_uno/gcc3_linux_s390/makefile.mk
++++ b/bridges/source/cpp_uno/gcc3_linux_s390/makefile.mk
+@@ -46,7 +46,7 @@ CFLAGS += -DLEAK_STATIC_DATA
+ 
+ # In case someone enabled the non-standard -fomit-frame-pointer which does not
+ # work with the .cxx sources in this directory:
+-CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing
++CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing -mno-avx
+ 
+ CFLAGSNOOPT=-O0
+ 
+diff --git a/bridges/source/cpp_uno/gcc3_linux_s390x/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_s390x/makefile.mk
+index 9539dd6..aa47f6b 100644
+--- a/bridges/source/cpp_uno/gcc3_linux_s390x/makefile.mk
++++ b/bridges/source/cpp_uno/gcc3_linux_s390x/makefile.mk
+@@ -46,7 +46,7 @@ CFLAGS += -DLEAK_STATIC_DATA
+ 
+ # In case someone enabled the non-standard -fomit-frame-pointer which does not
+ # work with the .cxx sources in this directory:
+-CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing
++CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing -mno-avx
+ 
+ CFLAGSNOOPT=-O0
+ 
+diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_sparc/makefile.mk
+index 3940038..2ee35bb 100644
+--- a/bridges/source/cpp_uno/gcc3_linux_sparc/makefile.mk
++++ b/bridges/source/cpp_uno/gcc3_linux_sparc/makefile.mk
+@@ -45,7 +45,7 @@ CFLAGS += -DLEAK_STATIC_DATA
+ 
+ # In case someone enabled the non-standard -fomit-frame-pointer which does not
+ # # work with the .cxx sources in this directory:
+-CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing
++CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing -mno-avx
+ 
+ CFLAGSNOOPT=-O0
+ 
+diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_x86-64/makefile.mk
+index dd35432..ad5de1a 100644
+--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/makefile.mk
++++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/makefile.mk
+@@ -50,7 +50,7 @@ CFLAGS += -DLEAK_STATIC_DATA
+ 
+ # In case someone enabled the non-standard -fomit-frame-pointer which does not
+ # work with the .cxx sources in this directory:
+-CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing
++CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing -mno-avx
+ 
+ SLOFILES= \
+     $(SLO)$/abi.obj			\
+diff --git a/bridges/source/cpp_uno/mingw_intel/makefile.mk b/bridges/source/cpp_uno/mingw_intel/makefile.mk
+index 2c7a8da..a3c2b2a 100644
+--- a/bridges/source/cpp_uno/mingw_intel/makefile.mk
++++ b/bridges/source/cpp_uno/mingw_intel/makefile.mk
+@@ -49,7 +49,7 @@ CFLAGS += -DBROKEN_ALLOCA
+ 
+ # In case someone enabled the non-standard -fomit-frame-pointer which does not
+ # work with the .cxx sources in this directory:
+-CFLAGSCXX += -fno-omit-frame-pointer
++CFLAGSCXX += -fno-omit-frame-pointer -mno-avx
+ 
+ NOOPTFILES= \
+     $(SLO)$/uno2cpp.obj
+-- 
+1.7.3.4
+
diff --git a/app-office/libreoffice/libreoffice-3.4.2.3.ebuild b/app-office/libreoffice/libreoffice-3.4.2.3.ebuild
index c34dfee9b5a7..4f47a78f9b70 100644
--- a/app-office/libreoffice/libreoffice-3.4.2.3.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.3.ebuild,v 1.14 2011/07/31 00:28:46 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.3.ebuild,v 1.15 2011/08/01 15:51:36 scarabeus Exp $
 
 EAPI=3
 
@@ -236,6 +236,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-translate-toolkit-parallel-solenv.patch"
 	"${FILESDIR}/${PN}-gbuild-use-cxxflags.patch"
 	"${FILESDIR}/${PN}-installed-files-permissions.patch"
+	"${FILESDIR}/${PN}-append-no-avx.patch"
 )
 
 # Uncoment me when updating to eapi4