diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2011-08-05 07:41:12 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2011-08-05 07:41:12 +0000 |
| commit | fd3f7fd392b2ede655bf9975d87deb143c22abb8 (patch) | |
| tree | 96b90c2af664321ee33683eb406170497a869b61 /app-office | |
| parent | remove deprecated oknodo from init script - bug #377767 (diff) | |
| download | gentoo-2-fd3f7fd392b2ede655bf9975d87deb143c22abb8.tar.gz gentoo-2-fd3f7fd392b2ede655bf9975d87deb143c22abb8.tar.bz2 gentoo-2-fd3f7fd392b2ede655bf9975d87deb143c22abb8.zip | |
Fix avx patch wrt bug #377845. Proxied for scarabeus.
(Portage version: 2.2.0_alpha50_p1/cvs/Linux x86_64)
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/libreoffice/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/libreoffice/files/libreoffice-check-for-avx.patch | 11 |
2 files changed, 13 insertions, 4 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index d4e7b7428da5..50679492e6ff 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.85 2011/08/04 17:56:40 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.86 2011/08/05 07:41:11 mgorny Exp $ + + 05 Aug 2011; Michał Górny <mgorny@gentoo.org> + files/libreoffice-check-for-avx.patch: + Fix avx patch wrt bug #377845. Proxied for scarabeus. 04 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org> libreoffice-3.4.2.3.ebuild, +files/libreoffice-binfilter-as-needed.patch: diff --git a/app-office/libreoffice/files/libreoffice-check-for-avx.patch b/app-office/libreoffice/files/libreoffice-check-for-avx.patch index fd487d913605..57f479f7b67f 100644 --- a/app-office/libreoffice/files/libreoffice-check-for-avx.patch +++ b/app-office/libreoffice/files/libreoffice-check-for-avx.patch @@ -1,8 +1,8 @@ diff --git a/configure.in b/configure.in -index 65813cb..5f5085e 100755 +index 65813cb..bfa612c 100755 --- a/configure.in +++ b/configure.in -@@ -1984,6 +1984,36 @@ if test "$GCC" = "yes"; then +@@ -1984,6 +1984,41 @@ if test "$GCC" = "yes"; then fi AC_SUBST(HAVE_LD_BSYMBOLIC_FUNCTIONS) @@ -34,7 +34,12 @@ index 65813cb..5f5085e 100755 +}], 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"]) ++AS_IF([test "x$have_avx_intrinsics" = "xyes"], [ ++ HAVE_GCC_AVX=TRUE ++], [ ++ HAVE_GCC_AVX=FALSE ++]) ++AC_SUBST(HAVE_GCC_AVX) + dnl =================================================================== dnl Set the ENABLE_PCH variable. (Activate --enable-pch) |