diff options
| author |   Andreas Proschofsky <suka@gentoo.org> | 2007-09-20 06:44:20 +0000 |
|---|---|---|
| committer | Andreas Proschofsky <suka@gentoo.org> | 2007-09-20 06:44:20 +0000 |
| commit | 46625f7ad8ceb19b50615af95704b1201ec4e092 (patch) | |
| tree | d356a6bf7d4579e30467b08989e5526d686479a9 /app-office/openoffice | |
| parent | fix #191640; cleanup (diff) | |
| download | gentoo-2-46625f7ad8ceb19b50615af95704b1201ec4e092.tar.gz gentoo-2-46625f7ad8ceb19b50615af95704b1201ec4e092.tar.bz2 gentoo-2-46625f7ad8ceb19b50615af95704b1201ec4e092.zip | |
Trying to fix internal STLport build on ppc, see bug #193056
(Portage version: 2.1.3.9)
Diffstat (limited to 'app-office/openoffice')
4 files changed, 71 insertions, 2 deletions
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog index f9bae33231e9..9654c7a86afe 100644 --- a/app-office/openoffice/ChangeLog +++ b/app-office/openoffice/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-office/openoffice # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.339 2007/09/19 20:31:45 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.340 2007/09/20 06:44:20 suka Exp $ + + 20 Sep 2007; Andreas Proschofsky <suka@gentoo.org> + +files/2.3.0/stlport-ppc-buildfix.diff, + +files/2.3.0/stlport-ppc-buildfix-apply.diff, openoffice-2.3.0.ebuild: + Trying to fix internal STLport build on ppc, see bug #193056 19 Sep 2007; Andreas Proschofsky <suka@gentoo.org> openoffice-2.3.0.ebuild: diff --git a/app-office/openoffice/files/2.3.0/stlport-ppc-buildfix-apply.diff b/app-office/openoffice/files/2.3.0/stlport-ppc-buildfix-apply.diff new file mode 100644 index 000000000000..49f69c796699 --- /dev/null +++ b/app-office/openoffice/files/2.3.0/stlport-ppc-buildfix-apply.diff @@ -0,0 +1,12 @@ +--- patches/src680/apply ++++ patches/src680/apply +@@ -1063,6 +1063,8 @@ + vcl_font-NO_LIST.diff + # linux-headers-2.6.22 issue?! + linux-headers.diff ++# stlport build problem on ppc ++stlport-ppc-buildfix.diff + + [ DebianBaseOnly ] + SectionOwner => rengelha + diff --git a/app-office/openoffice/files/2.3.0/stlport-ppc-buildfix.diff b/app-office/openoffice/files/2.3.0/stlport-ppc-buildfix.diff new file mode 100644 index 000000000000..af70e4f26f13 --- /dev/null +++ b/app-office/openoffice/files/2.3.0/stlport-ppc-buildfix.diff @@ -0,0 +1,49 @@ +--- stlport/STLport-4.5.patch 2005-01-06 12:26:48.770546592 +1100 ++++ stlport/STLport-4.5.patch 2005-01-06 12:26:01.125789696 +1100 +@@ -509,6 +509,45 @@ + + CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g + CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC ++--- misc/build/STLport-4.5/src/gcc-linux.mak.old 2005-01-06 12:22:54.127217800 +1100 +++++ misc/build/STLport-4.5/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.5/src/gcc.mak.old 2005-01-06 15:20:18.840975336 +1100 +++++ misc/build/STLport-4.5/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 ++--- misc/build/STLport-4.5/src/gcc-3.0.mak.orig +++++ misc/build/STLport-4.5/src/gcc-3.0.mak ++@@ -43,8 +43,8 @@ ++ CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g -fPIC ++ CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -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 + *** misc/STLport-4.5/stlport/config/stl_gcc.h Tue Sep 4 19:10:16 2001 + --- misc/build/STLport-4.5/stlport/config/stl_gcc.h Thu Jul 26 12:13:03 2007 + *************** + diff --git a/app-office/openoffice/openoffice-2.3.0.ebuild b/app-office/openoffice/openoffice-2.3.0.ebuild index e81b71f5ff80..f90973b9eb2b 100644 --- a/app-office/openoffice/openoffice-2.3.0.ebuild +++ b/app-office/openoffice/openoffice-2.3.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.3.0.ebuild,v 1.3 2007/09/19 20:31:45 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.3.0.ebuild,v 1.4 2007/09/20 06:44:20 suka Exp $ WANT_AUTOCONF="2.5" WANT_AUTOMAKE="1.9" @@ -205,6 +205,9 @@ src_unpack() { cp -f ${FILESDIR}/${PV}/disable-regcomp-java.diff ${S}/patches/src680 || die cp -f ${FILESDIR}/${PV}/disable-regcomp-python.diff ${S}/patches/src680 || die epatch ${FILESDIR}/${PV}/regcompapply.diff + #Fix for internal STLport + cp -f ${FILESDIR}/${PV}/stlport-ppc-buildfix.diff ${S}/patches/src680 || die + epatch ${FILESDIR}/${PV}/stlport-ppc-buildfix-apply.diff fi #Use flag checks |