diff options
| author |   Joseph Jezak <josejx@gentoo.org> | 2005-01-07 02:56:37 +0000 |
|---|---|---|
| committer | Joseph Jezak <josejx@gentoo.org> | 2005-01-07 02:56:37 +0000 |
| commit | 8dd2fd6f98f2eaaa7bfceda4adddf4161ef40de2 (patch) | |
| tree | e8c9bd0272634b814e339a3ea8201195e5def03b /app-office/openoffice | |
| parent | Trying to refix #76517 by adding in better X11 lib logic. Hopefully this wor... (diff) | |
| download | gentoo-2-8dd2fd6f98f2eaaa7bfceda4adddf4161ef40de2.tar.gz gentoo-2-8dd2fd6f98f2eaaa7bfceda4adddf4161ef40de2.tar.bz2 gentoo-2-8dd2fd6f98f2eaaa7bfceda4adddf4161ef40de2.zip | |
Added fix for compiling on ppc with gcc 3.4.3. Also marked ppc stable. Fixes bug #73940 and bug #71286.
Diffstat (limited to 'app-office/openoffice')
| -rw-r--r-- | app-office/openoffice/ChangeLog | 8 | ||||
| -rw-r--r-- | app-office/openoffice/files/1.1.4/STLport-vector.patch | 32 | ||||
| -rw-r--r-- | app-office/openoffice/openoffice-1.1.4.ebuild | 9 |
3 files changed, 46 insertions, 3 deletions
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog index ed6329ab156c..18d051fa3bbf 100644 --- a/app-office/openoffice/ChangeLog +++ b/app-office/openoffice/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-office/openoffice # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.95 2005/01/01 10:19:25 josejx Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.96 2005/01/07 02:56:37 josejx Exp $ + + 07 Jan 2005; Joseph Jezak <josejx@gentoo.org> + +files/1.1.4/STLport-vector.patch, openoffice-1.1.4.ebuild: + Added a workaround for compiling openoffice on ppc with gcc 3.4.3. This + might break the debug use flag, but I'm not entirely sure. This fixes bug + #73940. Also, marked ppc stable for bug #71268. 01 Jan 2005; Joseph Jezak <josejx@gentoo.org> openoffice-1.1.4.ebuild: Marked ~ppc. Still only compiles on ppc with gcc 3.4.1 (not 3.4.3). diff --git a/app-office/openoffice/files/1.1.4/STLport-vector.patch b/app-office/openoffice/files/1.1.4/STLport-vector.patch new file mode 100644 index 000000000000..1892f1cabeed --- /dev/null +++ b/app-office/openoffice/files/1.1.4/STLport-vector.patch @@ -0,0 +1,32 @@ +--- stlport/STLport-4.6.2.patch 2005-01-06 12:26:48.770546592 +1100 ++++ stlport/STLport-4.6.2.patch 2005-01-06 12:26:01.125789696 +1100 +@@ -69,3 +69,29 @@ + ln -s $(STLDEBUG_DYNLIB) $(OUTDIR)/$(STLDEBUG_NAME).$(DYNEXT) + + install_unix : ++--- misc/build/STLport-4.6.2/src/gcc-linux.mak.old 2005-01-06 12:22:54.127217800 +1100 +++++ misc/build/STLport-4.6.2/src/gcc-linux.mak 2005-01-06 12:24:28.192917640 +1100 ++@@ -46,8 +46,8 @@ ++ CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -O -g ++ CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -O -g -fPIC ++ ++-CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG ++-CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG -fPIC +++CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) +++CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -fPIC ++ ++ include common_percent_rules.mak ++ include common_rules.mak ++--- misc/build/STLport-4.6.2/src/gcc.mak.old 2005-01-06 15:20:18.840975336 +1100 +++++ misc/build/STLport-4.6.2/src/gcc.mak 2005-01-06 15:21:00.373661408 +1100 ++@@ -44,8 +44,8 @@ ++ CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -O -g ++ CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -O -g -fPIC ++ ++-CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG ++-CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG +++CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) +++CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) ++ ++ include common_percent_rules.mak ++ include common_rules.mak diff --git a/app-office/openoffice/openoffice-1.1.4.ebuild b/app-office/openoffice/openoffice-1.1.4.ebuild index b8675600ff75..052b4e272b02 100644 --- a/app-office/openoffice/openoffice-1.1.4.ebuild +++ b/app-office/openoffice/openoffice-1.1.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1.4.ebuild,v 1.2 2005/01/01 10:19:26 josejx Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1.4.ebuild,v 1.3 2005/01/07 02:56:37 josejx Exp $ # Notes: # @@ -39,7 +39,7 @@ HOMEPAGE="http://www.openoffice.org/" LICENSE="|| ( LGPL-2 SISSL-1.1 )" SLOT="0" -KEYWORDS="~x86 ~ppc" +KEYWORDS="~x86 ppc" RDEPEND="!app-office/openoffice-bin >=sys-libs/glibc-2.1 @@ -228,6 +228,11 @@ src_unpack() { epatch ${FILESDIR}/${PV}/gcc-instlib.patch + # Workaround for bug #73940, may break debug use flag on ppc + if use ppc; then + epatch ${FILESDIR}/${PV}/STLport-vector.patch + fi + #Fix for newer Freetype epatch ${FILESDIR}/${PV}/freetype-217.patch |