From: Tomas Chvatal Date: Thu, 4 Aug 2011 16:18:37 +0000 (+0000) Subject: Update avx patchset and fix the linguas detection. X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=21f644192f6b5060e32752c6aac5428cd198d405;p=gentoo.git Update avx patchset and fix the linguas detection. Package-Manager: portage-2.2.0_alpha50/cvs/Linux x86_64 --- diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index 94bec8b0c09d..c00ca64796fa 100644 --- a/app-office/libreoffice/ChangeLog +++ b/app-office/libreoffice/ChangeLog @@ -1,6 +1,11 @@ # 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.82 2011/08/03 20:21:09 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.83 2011/08/04 16:18:37 scarabeus Exp $ + + 04 Aug 2011; Tomáš Chvátal + libreoffice-3.4.2.3.ebuild, +files/libreoffice-check-for-avx.patch, + files/libreoffice-append-no-avx.patch: + Update avx patchset and fix the linguas detection. 03 Aug 2011; Tomáš Chvátal files/libreoffice-32b-qt4-libdir.patch: diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index 76f79525cdf0..229b3f872d31 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -13,8 +13,9 @@ AUX libreoffice-3.3.1-neon_remove_SSPI_support.diff 1081 RMD160 9c91936b136055a6 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-32b-qt4-libdir.patch 878 RMD160 5d1d90ca61106ac4962d7f70489910191f4347b6 SHA1 5be37237f9564613c893a7e486b2a1ebb24584c7 SHA256 9785fe9ae6c11f922b13941a5b60733a8bce70b08db71a9447e960191b210f0d -AUX libreoffice-append-no-avx.patch 9329 RMD160 fce82cac5b15592cc9bd7b4af90372987fb198cb SHA1 4145cd7741c5b1e9ee2fb3974db7bda0f68282c5 SHA256 fab496a65e583bd484d5a5671d712acc17643c8f655e419f5148b2de9fc5c256 +AUX libreoffice-append-no-avx.patch 2415 RMD160 b1080696d5a77eff0997422f73ba10c2d2a6b09f SHA1 ca026ee7941002e340e12b1bff164841024ca2dc SHA256 2d7542645585af2f485d38bbdb23c4c2f369301139de8cb441417e9ae15f85b6 AUX libreoffice-as-needed-gtk.patch 403 RMD160 c1c5733d282eb3b59b7fe03d5258e9c917d9c6c4 SHA1 7516a3d554d96b7a27e5884ef124f9f5166a5939 SHA256 88609b6bac793423dee7af79110a05981669471170f9473a2bc591d35927117a +AUX libreoffice-check-for-avx.patch 1913 RMD160 f3660a48be7a9eb553cef25784b2adc9d4e73c8e SHA1 2cce3839c9c1a31078427ca73c644d8dc7ed1365 SHA256 7d18e8ea61df6144fabb3b05d55edf450b5c270b3fb99c66167151d233f3aed0 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 AUX libreoffice-installed-files-permissions.patch 374 RMD160 83d650b6b0e84a02e2ad0667b20d4dba72cf4ee2 SHA1 87345e895473a8bb209b0ad542670c5eb7717ab0 SHA256 a664796c27c69fe5119af5d82313dc65371eb873c1d15691d97745d9a1ee3e81 @@ -168,14 +169,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 18768 RMD160 8f8402a6439e032f6d85f28e503e5c5406a734f8 SHA1 0a59fe9a554120034288df4d70a32481ce4fac6e SHA256 774b56c62b29a23153f44c03a86e13b96d72416b37cfd5f1f16620f29a80968f +EBUILD libreoffice-3.4.2.3.ebuild 19193 RMD160 a40aa3c9d8e6a87d2edd95f36730ac8809862f5b SHA1 95b6ac9f88bd0dbc3a3527e2b007520a32e490c5 SHA256 06c10575dcc0d532cc38f96244f4629ec1a4a4f74f161fedde1ef19b483d5a8f EBUILD libreoffice-3.4.9999.ebuild 18680 RMD160 6f9c763b9980005d26b9de08df1456ffe7ce2443 SHA1 7b3702902b61332c6e87faeca6594ee9904d6c08 SHA256 4bb3fab5fd3b5736dc0f4e1e3a7ac7ff8dc5257734acf0f3e47130e98a2f8310 -MISC ChangeLog 16440 RMD160 9ca5a4a818503bb72cabbd8c181bcb6e3a052350 SHA1 2653ae67396bb1b73e376438157ea7e63d8522b6 SHA256 bef885b2a36333b11d7285d01856f6c9d252bf450855c57164df3f8ba33c88c3 +MISC ChangeLog 16660 RMD160 0fde581a178c31d8febc31ecbe51699bd2549080 SHA1 4a02e0b079df13675fadac805c25ac10f04289ab SHA256 65a92c801186967a680a2bfb2248a6f346b3bc7ebe7831127b864fa50508ae16 MISC metadata.xml 1070 RMD160 5a010568eabba00eaa6193765fa5d181462dc5a5 SHA1 9973d230e4e10704136eddd33c8e20ddf485ba9f SHA256 c15b697bd70ccf20aef38b02b55a316cc02df24e027daf6d9b0d185d920469b3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk45rZ0ACgkQHB6c3gNBRYdLwACgxDM9E/1NpJfUW5gxXT+VCTNf -+zYAoKu4gLbqgHCUD/IATBv9QHYYCko1 -=g+HC +iEYEARECAAYFAk46xlsACgkQHB6c3gNBRYfaEQCcCCrRWnFQI522l6eo7azrHrc5 +RRwAoMiivN8asIZPlZRbXd3FV7W3Xlx7 +=XAMd -----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 index 693d49a632b9..76e3c3941db3 100644 --- a/app-office/libreoffice/files/libreoffice-append-no-avx.patch +++ b/app-office/libreoffice/files/libreoffice-append-no-avx.patch @@ -1,207 +1,65 @@ -From 7424b4357b24736ddad75e2449839bf0ecc8e09b Mon Sep 17 00:00:00 2001 +From 16d4258863c936538ef3b7ff13a95f7567a62044 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(-) + .../source/cpp_uno/gcc3_linux_intel/makefile.mk | 6 ++++++ + .../source/cpp_uno/gcc3_linux_x86-64/makefile.mk | 6 ++++++ + bridges/source/cpp_uno/mingw_intel/makefile.mk | 6 ++++++ + 3 files changed, 18 insertions(+), 0 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 +index beedf9d..609e09a 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 +@@ -52,6 +52,12 @@ CFLAGS += -DLEAK_STATIC_DATA # 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 - + CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing + ++# In case the compiler supports AVX this code segfaults so specifically turn ++# it off. ++.IF "$(HAVE_GCC_AVX)" == "YES" ++ CFLAGSCXX+= -mno-avx ++.ENDIF ++ CFLAGSNOOPT=-O0 + SLOFILES= \ 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 +index dd35432..e519105 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 +@@ -52,6 +52,12 @@ CFLAGS += -DLEAK_STATIC_DATA # 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 - + CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing + ++# In case the compiler supports AVX this code segfaults so specifically turn ++# it off. ++.IF "$(HAVE_GCC_AVX)" == "YES" ++ CFLAGSCXX+= -mno-avx ++.ENDIF ++ SLOFILES= \ $(SLO)$/abi.obj \ + $(SLO)$/except.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 +index 2c7a8da..d2b0809 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 +@@ -51,6 +51,12 @@ CFLAGS += -DBROKEN_ALLOCA # work with the .cxx sources in this directory: --CFLAGSCXX += -fno-omit-frame-pointer -+CFLAGSCXX += -fno-omit-frame-pointer -mno-avx - + CFLAGSCXX += -fno-omit-frame-pointer + ++# In case the compiler supports AVX this code segfaults so specifically turn ++# it off. ++.IF "$(HAVE_GCC_AVX)" == "YES" ++ CFLAGSCXX+= -mno-avx ++.ENDIF ++ NOOPTFILES= \ $(SLO)$/uno2cpp.obj + -- 1.7.3.4 diff --git a/app-office/libreoffice/files/libreoffice-check-for-avx.patch b/app-office/libreoffice/files/libreoffice-check-for-avx.patch new file mode 100644 index 000000000000..fd487d913605 --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-check-for-avx.patch @@ -0,0 +1,53 @@ +diff --git a/configure.in b/configure.in +index 65813cb..5f5085e 100755 +--- a/configure.in ++++ b/configure.in +@@ -1984,6 +1984,36 @@ if test "$GCC" = "yes"; then + fi + AC_SUBST(HAVE_LD_BSYMBOLIC_FUNCTIONS) + ++dnl Check for AVX ++dnl =================================================================== ++AS_IF([test "x$AVX_CFLAGS" = "x"], [ ++ AS_IF([test "x$SUNCC" = "xyes" && test "x$AMD64_ABI" = "xno"], [ ++ AVX_CFLAGS="-xarch=avx" ++ ]) ++], [ ++ AVX_CFLAGS="-mavx -Winline" ++]) ++ ++have_avx_intrinsics=no ++AC_MSG_CHECKING(whether to use AVX intrinsics) ++avx_save_CFLAGS=$CFLAGS ++CFLAGS="$AVX_CFLAGS $CFLAGS" ++AC_COMPILE_IFELSE([ ++#if defined(__GNUC__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 5)) ++# if !defined(__amd64__) && !defined(__x86_64__) ++# error "Need GCC >= 4.5 for AVX intrinsics on x86" ++# endif ++#endif ++#include ++int main () { ++ __m256i a = _mm256_set1_epi32 (0), b = _mm256_set1_epi32 (0), c; ++ c = _mm256_permute2f128_si256 (a, b, 0); ++ return 0; ++}], have_avx_intrinsics=yes) ++CFLAGS=$avx_save_CFLAGS ++AC_MSG_RESULT([$have_avx_intrinsics]) ++AM_CONDITIONAL(HAVE_GCC_AVX, [test "x$have_avx_intrinsics" = "xyes"]) ++ + dnl =================================================================== + dnl Set the ENABLE_PCH variable. (Activate --enable-pch) + dnl =================================================================== +diff --git a/set_soenv.in b/set_soenv.in +index 4c047b6..a2b1b43 100755 +--- a/set_soenv.in ++++ b/set_soenv.in +@@ -1841,6 +1841,7 @@ ToFile( "JAVAHOME", $JAVAHOME, "e" ); + ToFile( "CC", $CC, "e" ); + ToFile( "HAVE_GCC_VISIBILITY_FEATURE", + "@HAVE_GCC_VISIBILITY_FEATURE@", "e" ); ++ToFile( "HAVE_GCC_AVX", "@HAVE_GCC_AVX@", "e" ); + ToFile( "HAVE_GCC_VISIBILITY_BROKEN", + "@HAVE_GCC_VISIBILITY_BROKEN@", "e" ); + ToFile( "HAVE_LD_HASH_STYLE","@HAVE_LD_HASH_STYLE@","e" ); diff --git a/app-office/libreoffice/libreoffice-3.4.2.3.ebuild b/app-office/libreoffice/libreoffice-3.4.2.3.ebuild index 87b48341f4f1..089fb3509315 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.16 2011/08/03 17:23:04 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.3.ebuild,v 1.17 2011/08/04 16:18:37 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}-check-for-avx.patch" "${FILESDIR}/${PN}-append-no-avx.patch" "${FILESDIR}/${PN}-32b-qt4-libdir.patch" ) @@ -351,7 +352,19 @@ src_unpack() { src_prepare() { strip-linguas ${LANGUAGES} - LINGUAS_OOO=$(echo ${LINGUAS} | sed -e 's/\ben\b/en_US/;s/_/-/g') + + # HACK: linguas needs special parsing until fixed upstream + if [[ -z ${LINGUAS} || ${LINGUAS} == en ]]; then + # if empty or just english we want empty + LO_LANGUAGES= + elif [[ ${LINGUAS} =~ en( |$) ]]; then + # otherwise if more then one language and english we + # replace en to en-US + LO_LANGUAGES="$(sed -e 's/\ben\b/en_US/;s/_/-/g' <<< ${LINGUAS})" + else + # and finally if no en is set we add en-US + LO_LANGUAGES="en-US ${LINGUAS//_/-}" + fi # Now for our optimization flags ... export ARCH_FLAGS="${CXXFLAGS}"