From b5127d32284bf64d6adb31a9cfad6b8eb8cb456c Mon Sep 17 00:00:00 2001 From: Tomas Chvatal Date: Mon, 1 Aug 2011 15:51:36 +0000 Subject: [PATCH] Append no-avx to fix segmentation fault. Package-Manager: portage-2.2.0_alpha47/cvs/Linux x86_64 --- app-office/libreoffice/ChangeLog | 6 +- app-office/libreoffice/Manifest | 11 +- .../files/libreoffice-append-no-avx.patch | 207 ++++++++++++++++++ .../libreoffice/libreoffice-3.4.2.3.ebuild | 3 +- 4 files changed, 220 insertions(+), 7 deletions(-) create mode 100644 app-office/libreoffice/files/libreoffice-append-no-avx.patch 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 + libreoffice-3.4.2.3.ebuild, +files/libreoffice-append-no-avx.patch: + Append no-avx to fix segmentation fault. 31 Jul 2011; Matt Turner libreoffice-3.4.9999.ebuild: Remove seemingly unnecessary fonts from -3.4.9999 also. diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index a771ef452245..91cc159d24ad 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -12,6 +12,7 @@ AUX libreoffice-3.3.0_libxmlsec_fix_extern_c.diff 1256 RMD160 278ea1a7025e2e47ce AUX libreoffice-3.3.1-neon_remove_SSPI_support.diff 1081 RMD160 9c91936b136055a61e90fb2269e63c720af1e562 SHA1 e9e83130a6d4814e2a15b0d1062c2b21d97d23b3 SHA256 646ccebdce09fd2d29093b956244725191f376099be0b397365064a974dc5e7e AUX libreoffice-3.3.2-bison25.diff 911 RMD160 b3335fe3728e97b69bde744dcd34dc27d4f3212c SHA1 857406c4735f9bcb0d1a7bd0b1dec3b444142ac6 SHA256 d16a9c2a41d2a5669208eac33212920e2d356da60d30e9dc5126ccd13319464b AUX libreoffice-3.4.1-salfix.diff 668 RMD160 3764e664888b423d81f9e78def6c2a93e037a462 SHA1 10e0128da7ddebdae3b52983e91363940b151cf1 SHA256 3adf1eab52b80c34b3ef1f8ab26eb6171af4515c8e05a264dcf10bd7c45e20e7 +AUX libreoffice-append-no-avx.patch 9329 RMD160 fce82cac5b15592cc9bd7b4af90372987fb198cb SHA1 4145cd7741c5b1e9ee2fb3974db7bda0f68282c5 SHA256 fab496a65e583bd484d5a5671d712acc17643c8f655e419f5148b2de9fc5c256 AUX libreoffice-as-needed-gtk.patch 403 RMD160 c1c5733d282eb3b59b7fe03d5258e9c917d9c6c4 SHA1 7516a3d554d96b7a27e5884ef124f9f5166a5939 SHA256 88609b6bac793423dee7af79110a05981669471170f9473a2bc591d35927117a AUX libreoffice-fix-sandbox-install.patch 1609 RMD160 e79859f6343e04808cc261c101483ff2ba0f1a5d SHA1 579d30eafb7a7e54531faf4bc8d3bd35150494f7 SHA256 fdb54126c78837d73e7a095ceedba9329b121ce2ce1d1a23ad75247b8f144b50 AUX libreoffice-gbuild-use-cxxflags.patch 353 RMD160 97f0c4cffe624ca8df71471cae61975176464847 SHA1 d1a2de4de89055fc4150f27022ea9f0fa5a34f20 SHA256 27ccd9ec886f2f6433969524860b3fa7199531b5f5d774f7643d6bc75883222a @@ -166,14 +167,14 @@ DIST libreoffice-writer-3.4.2.3.tar.bz2 7294695 RMD160 2a7210c518376d9fe5c6e8a50 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c EBUILD libreoffice-3.3.1.ebuild 18572 RMD160 d92d1933c8bbde7d28425b11717614cf6cf7b1e0 SHA1 60ef1f62c341ce7997de7ff5bcef04b304f4dfd9 SHA256 a3fae0a7f7da4a92e67d9c86ba4e7f92a92bbfac8f40a2703c64f317b670da6b EBUILD libreoffice-3.3.3.ebuild 18134 RMD160 95cf52bf10765cd9bb7862c673dc57a96bcca376 SHA1 4a001ff974125839ad5219915bb2f8399e6f90f8 SHA256 a60d52f57767ac5e9f46ad5204dd27b4f4a45ac1468357c41462b502d37b8626 -EBUILD libreoffice-3.4.2.3.ebuild 18684 RMD160 50b255c478ac0ed0ab9f6ed08213a12296e74b20 SHA1 d9a50903e2d7efd214d537d604ad3ac37d56e111 SHA256 701192c80ebd1a7fcd14c807665fda8f82f2c2a9af694fe3d5f2876dd40b2b18 +EBUILD libreoffice-3.4.2.3.ebuild 18726 RMD160 a2eda3881f2d726daf7c35b540ddc996164058f7 SHA1 0a2564e3081b9d0702af585e1cce3538494709b2 SHA256 797be37f343820df8d15d1e7fcac65358eec4038a3a01fdd73bf404c814d96d3 EBUILD libreoffice-3.4.9999.ebuild 18637 RMD160 80bca4571deb9d80c2c3ada76531d2b11bf7efab SHA1 f8b990b335c8d848f218e727e172c1e0bbfb4c71 SHA256 cf98d148b57783327d4d2d256ada2d03d048444888c987d0e38c781c4719df15 -MISC ChangeLog 15886 RMD160 67544ba9adcaebb9daa532a40f293ba7ce18e10c SHA1 fa9cdd0edbfeab6733ff4428532f35c4eae96535 SHA256 6c78a6133f438b2e800267393407998cb28627019183af13a287b6e8e9a8ecd8 +MISC ChangeLog 16056 RMD160 adaa762686f0de53aef9318a6b1d52513f5204c2 SHA1 016b7a4a31f32a8cf0efaf957d9df15696e029c5 SHA256 768c9d0519b52e57ad41b26e856bf9185791fea80e26069f8c18e7aebe0b24d1 MISC metadata.xml 1070 RMD160 5a010568eabba00eaa6193765fa5d181462dc5a5 SHA1 9973d230e4e10704136eddd33c8e20ddf485ba9f SHA256 c15b697bd70ccf20aef38b02b55a316cc02df24e027daf6d9b0d185d920469b3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk41fOwACgkQTVUdg23rv51utwCeJU1cvji/39Be84vEjxZFaEfY -XfEAn0btX24RiTrz/n22zz+rfSMzr978 -=nLi+ +iEYEARECAAYFAk42y5IACgkQHB6c3gNBRYdUaQCfY7JTUKHwBzxIVbC3n/DZTIkk +O6cAoJhQEnw6YaVQ3Jg2WVa/Lk6u4/Dn +=+hXb -----END PGP SIGNATURE----- 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?= +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 -- 2.26.2