diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2011-07-26 20:47:57 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-07-26 20:47:57 +0000 |
| commit | dc67633d02d561b22d5a82d700df393f45c3dfbb (patch) | |
| tree | 99f884f8615ffbc5b2cd96957fe88d7816424725 /app-office | |
| parent | Version bump, drop ancient. (diff) | |
| download | gentoo-2-dc67633d02d561b22d5a82d700df393f45c3dfbb.tar.gz gentoo-2-dc67633d02d561b22d5a82d700df393f45c3dfbb.tar.bz2 gentoo-2-dc67633d02d561b22d5a82d700df393f45c3dfbb.zip | |
Force proper variable usage. Just saw this in gekis overlay so adding to main tree too.
(Portage version: 2.2.0_alpha47/cvs/Linux x86_64)
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/libreoffice/ChangeLog | 7 | ||||
| -rw-r--r-- | app-office/libreoffice/files/libreoffice-gbuild-use-cxxflags.patch | 11 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-3.4.2.2.ebuild | 3 |
3 files changed, 19 insertions, 2 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index d3df45da58e7..ff9eb80218ca 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.59 2011/07/26 20:39:13 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.60 2011/07/26 20:47:56 scarabeus Exp $ + + 26 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org> + libreoffice-3.4.2.2.ebuild, +files/libreoffice-gbuild-use-cxxflags.patch: + Force proper variable usage. Just saw this in gekis overlay so adding to main + tree too. 26 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-3.4.2.2.ebuild, diff --git a/app-office/libreoffice/files/libreoffice-gbuild-use-cxxflags.patch b/app-office/libreoffice/files/libreoffice-gbuild-use-cxxflags.patch new file mode 100644 index 000000000000..e7ad1222a37f --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-gbuild-use-cxxflags.patch @@ -0,0 +1,11 @@ +--- solenv/gbuild/gbuild.mk 2011-03-21 19:46:14.427883458 +0100 ++++ solenv/gbuild/gbuild.mk 2011-03-21 19:46:37.019883448 +0100 +@@ -128,7 +128,7 @@ + endif + endif + ifneq ($(strip $(CXXFLAGS)),) +-gb__ENV_CXXFLAGS := $(CFLAGS) ++gb__ENV_CXXFLAGS := $(CXXFLAGS) + else + # TODO remove after the old build system is abolished + ifneq ($(strip $(ENVCFLAGSCXX)),) diff --git a/app-office/libreoffice/libreoffice-3.4.2.2.ebuild b/app-office/libreoffice/libreoffice-3.4.2.2.ebuild index cab4980eb62c..36eb8404f86d 100644 --- a/app-office/libreoffice/libreoffice-3.4.2.2.ebuild +++ b/app-office/libreoffice/libreoffice-3.4.2.2.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.2.ebuild,v 1.18 2011/07/26 20:39:13 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild,v 1.19 2011/07/26 20:47:56 scarabeus Exp $ EAPI=3 @@ -222,6 +222,7 @@ PATCHES=( "${FILESDIR}/${PN}-as-needed-gtk.patch" "${FILESDIR}/${PN}-fix-sandbox-install.patch" "${FILESDIR}/${PN}-translate-toolkit-parallel-solenv.patch" + "${FILESDIR}/${PN}-gbuild-use-cxxflags.patch" ) # Uncoment me when updating to eapi4 |