diff options
| author |   Andreas Proschofsky <suka@gentoo.org> | 2009-09-08 18:18:45 +0000 |
|---|---|---|
| committer | Andreas Proschofsky <suka@gentoo.org> | 2009-09-08 18:18:45 +0000 |
| commit | dd6607256db34867d434d82710483775c047d54f (patch) | |
| tree | 3448c981ac1ead5532775644fb5aa9baeeb68e6d /app-office | |
| parent | Missing deprecated files. (diff) | |
| download | gentoo-2-dd6607256db34867d434d82710483775c047d54f.tar.gz gentoo-2-dd6607256db34867d434d82710483775c047d54f.tar.bz2 gentoo-2-dd6607256db34867d434d82710483775c047d54f.zip | |
Fix build problem in relation to boost, thanks to Jory A. Pratt
<anarchy@gentoo.org> for hunting it down. Closes bug #270947
(Portage version: 2.2_rc40/cvs/Linux i686)
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/openoffice/ChangeLog | 7 | ||||
| -rw-r--r-- | app-office/openoffice/files/boost-undefined-references.diff | 12 | ||||
| -rw-r--r-- | app-office/openoffice/openoffice-3.1.1.ebuild | 3 |
3 files changed, 20 insertions, 2 deletions
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog index 2659adc1e812..ca51185582d3 100644 --- a/app-office/openoffice/ChangeLog +++ b/app-office/openoffice/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-office/openoffice # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.481 2009/09/04 12:23:32 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.482 2009/09/08 18:18:45 suka Exp $ + + 08 Sep 2009; Andreas Proschofsky <suka@gentoo.org> + openoffice-3.1.1.ebuild, +files/boost-undefined-references.diff: + Fix build problem in relation to boost, thanks to Jory A. Pratt + <anarchy@gentoo.org> for hunting it down. Closes bug #270947 04 Sep 2009; Andreas Proschofsky <suka@gentoo.org> openoffice-3.1.1.ebuild: diff --git a/app-office/openoffice/files/boost-undefined-references.diff b/app-office/openoffice/files/boost-undefined-references.diff new file mode 100644 index 000000000000..b0700a7815f4 --- /dev/null +++ b/app-office/openoffice/files/boost-undefined-references.diff @@ -0,0 +1,12 @@ +--- sc/source/core/tool/makefile.mk-orig 2009-09-07 20:15:14.880679704 -0500 ++++ sc/source/core/tool/makefile.mk 2009-09-07 20:14:38.941679215 -0500 +@@ -132,7 +132,8 @@ + $(SLO)$/prnsave.obj \ + $(SLO)$/reftokenhelper.obj \ + $(SLO)$/stringutil.obj \ +- $(SLO)$/token.obj ++ $(SLO)$/token.obj \ ++ $(SLO)$/detfunc.obj + + # [kh] POWERPC compiler problem + .IF "$(OS)$(COM)$(CPUNAME)"=="LINUXGCCPOWERPC" diff --git a/app-office/openoffice/openoffice-3.1.1.ebuild b/app-office/openoffice/openoffice-3.1.1.ebuild index 83fa22f8d6de..3b974053d38a 100644 --- a/app-office/openoffice/openoffice-3.1.1.ebuild +++ b/app-office/openoffice/openoffice-3.1.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.1.1.ebuild,v 1.4 2009/09/04 12:23:32 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.1.1.ebuild,v 1.5 2009/09/08 18:18:45 suka Exp $ WANT_AUTOMAKE="1.9" EAPI="2" @@ -242,6 +242,7 @@ src_prepare() { epatch "${FILESDIR}/ooo-env_log.diff" cp -f "${FILESDIR}/base64.diff" "${S}/patches/hotfixes" || die cp -f "${FILESDIR}/xulrunner-1.9.1.diff" "${S}/patches/hotfixes" || die + cp -f "${FILESDIR}/boost-undefined-references.diff" "${S}/patches/hotfixes" || die #Use flag checks if use java ; then |