summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Hüttel <dilfridge@gentoo.org>2012-06-17 10:08:44 +0000
committerAndreas K. Hüttel <dilfridge@gentoo.org>2012-06-17 10:08:44 +0000
commit8170e15a2d196a3dfd3fe0186a91b5916e331924 (patch)
tree7798eec8d69578970240dc50756af1bc94f10deb /app-office/libreoffice
parentppc64 stable wrt #402919 (diff)
downloadgentoo-2-8170e15a2d196a3dfd3fe0186a91b5916e331924.tar.gz
gentoo-2-8170e15a2d196a3dfd3fe0186a91b5916e331924.tar.bz2
gentoo-2-8170e15a2d196a3dfd3fe0186a91b5916e331924.zip
Need to scale down Boost header usage a bit, no idea where the actual bug is
(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)
Diffstat (limited to 'app-office/libreoffice')
-rw-r--r--app-office/libreoffice/ChangeLog6
-rw-r--r--app-office/libreoffice/libreoffice-3.6.9999.ebuild5
-rw-r--r--app-office/libreoffice/libreoffice-9999-r2.ebuild5
3 files changed, 13 insertions, 3 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index a34a508d53cb..c521b71fff6c 100644
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-office/libreoffice
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.336 2012/06/11 14:01:00 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.337 2012/06/17 10:08:44 dilfridge Exp $
+
+ 17 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+ libreoffice-3.6.9999.ebuild, libreoffice-9999-r2.ebuild:
+ Need to scale down Boost header usage a bit, no idea where the actual bug is
11 Jun 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-3.6.9999.ebuild,
libreoffice-9999-r2.ebuild:
diff --git a/app-office/libreoffice/libreoffice-3.6.9999.ebuild b/app-office/libreoffice/libreoffice-3.6.9999.ebuild
index bd81ce7db56c..7966c0784054 100644
--- a/app-office/libreoffice/libreoffice-3.6.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-3.6.9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.6.9999.ebuild,v 1.4 2012/06/11 14:01:00 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.6.9999.ebuild,v 1.5 2012/06/17 10:08:44 dilfridge Exp $
EAPI=4
@@ -407,6 +407,9 @@ src_configure() {
"
fi
+ # it's not entirely clear to me where the failure is, boost libreoffice gcc come to my mind
+ append-cppflags -DBOOST_NO_0X_HDR_TYPEINDEX
+
# system headers/libs/...: enforce using system packages
# --enable-unix-qstart-libpng: use libpng splashscreen that is faster
# --enable-cairo: ensure that cairo is always required
diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild
index 4b82118bba3c..ca770365d1e0 100644
--- a/app-office/libreoffice/libreoffice-9999-r2.ebuild
+++ b/app-office/libreoffice/libreoffice-9999-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.84 2012/06/11 14:01:00 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.85 2012/06/17 10:08:44 dilfridge Exp $
EAPI=4
@@ -409,6 +409,9 @@ src_configure() {
"
fi
+ # it's not entirely clear to me where the failure is, boost libreoffice gcc come to my mind
+ append-cppflags -DBOOST_NO_0X_HDR_TYPEINDEX
+
# system headers/libs/...: enforce using system packages
# --enable-unix-qstart-libpng: use libpng splashscreen that is faster
# --enable-cairo: ensure that cairo is always required