diff options
| author |   Andreas Proschofsky <suka@gentoo.org> | 2005-01-16 22:59:19 +0000 |
|---|---|---|
| committer | Andreas Proschofsky <suka@gentoo.org> | 2005-01-16 22:59:19 +0000 |
| commit | 972a84b63869f38465c2323031b44ecf570c1695 (patch) | |
| tree | 55eba8aa6bd840c346dbbda5ee576fbc75744a64 /app-office/openoffice-ximian | |
| parent | few minor fixes. added support for econf if needed (diff) | |
| download | gentoo-2-972a84b63869f38465c2323031b44ecf570c1695.tar.gz gentoo-2-972a84b63869f38465c2323031b44ecf570c1695.tar.bz2 gentoo-2-972a84b63869f38465c2323031b44ecf570c1695.zip | |
Fixes for hardened-gccs, trying to solve bug #52642
(Portage version: 2.0.51-r13)
Diffstat (limited to 'app-office/openoffice-ximian')
4 files changed, 63 insertions, 3 deletions
diff --git a/app-office/openoffice-ximian/ChangeLog b/app-office/openoffice-ximian/ChangeLog index e7f8fdb68428..8adcc8723a1f 100644 --- a/app-office/openoffice-ximian/ChangeLog +++ b/app-office/openoffice-ximian/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-office/openoffice-ximian # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.92 2005/01/16 16:30:11 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.93 2005/01/16 22:59:19 suka Exp $ + + 16 Jan 2005; Andreas Proschofsky <suka@gentoo.org> + +files/1.1.3/hardened-link.patch, +files/1.1.3/pthreadlink-fix.patch, + openoffice-ximian-1.3.7.ebuild: + Try to fix build problems with hardened-gccs, patches provided by + Kevin F. Quinn <co@kevquinn.com> in bug #52642 16 Jan 2005; Andreas Proschofsky <suka@gentoo.org> openoffice-ximian-1.3.7.ebuild: diff --git a/app-office/openoffice-ximian/files/1.1.3/hardened-link.patch b/app-office/openoffice-ximian/files/1.1.3/hardened-link.patch new file mode 100644 index 000000000000..83c707dc106d --- /dev/null +++ b/app-office/openoffice-ximian/files/1.1.3/hardened-link.patch @@ -0,0 +1,14 @@ +diff -ur solenv.orig/inc/unxlngi4.mk solenv/inc/unxlngi4.mk +--- solenv.orig/inc/unxlngi4.mk 2004-10-23 20:09:29.344518376 +0200 ++++ solenv/inc/unxlngi4.mk 2004-10-23 20:09:43.084429592 +0200 +@@ -156,8 +156,8 @@ + LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH) + + # linker flags for linking applications +-LINKFLAGSAPPGUI= -Wl,-export-dynamic +-LINKFLAGSAPPCUI= -Wl,-export-dynamic ++LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,-z,execheap ++LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,-z,execheap + + # linker flags for linking shared libraries + LINKFLAGSSHLGUI= -shared diff --git a/app-office/openoffice-ximian/files/1.1.3/pthreadlink-fix.patch b/app-office/openoffice-ximian/files/1.1.3/pthreadlink-fix.patch new file mode 100644 index 000000000000..381221095037 --- /dev/null +++ b/app-office/openoffice-ximian/files/1.1.3/pthreadlink-fix.patch @@ -0,0 +1,32 @@ +diff -ur solenv.orig/inc/unxlngi4.mk solenv/inc/unxlngi4.mk +--- solenv.orig/inc/unxlngi4.mk 2004-10-23 20:07:59.714144264 +0200 ++++ solenv/inc/unxlngi4.mk 2004-10-23 20:08:36.190599000 +0200 +@@ -151,13 +151,13 @@ + LINK*=$(CC) + + # default linker flags +-LINKFLAGSDEFS*=-z defs ++LINKFLAGSDEFS*=-Wl,-z,defs + LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\' +-LINKFLAGS=-O2 -Bsymbolic -z combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH) ++LINKFLAGS=-Wl,-O2 -Bsymbolic,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH) + + # linker flags for linking applications +-LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec +-LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec ++LINKFLAGSAPPGUI= -Wl,-export-dynamic ++LINKFLAGSAPPCUI= -Wl,-export-dynamic + + # linker flags for linking shared libraries + LINKFLAGSSHLGUI= -shared +@@ -198,8 +198,8 @@ + + LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive + +-LIBSTLPORT=$(DYNAMIC) -lstlport_gcc -lstdc++ +-LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) ++LIBSTLPORT=$(DYNAMIC) -lstlport_gcc -lpthread -lstdc++ ++LIBSTLPORTST=$(STATIC) -lstlport_gcc -lpthread $(DYNAMIC) + + #FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC) + diff --git a/app-office/openoffice-ximian/openoffice-ximian-1.3.7.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.3.7.ebuild index 56949af70760..dc88564813e8 100644 --- a/app-office/openoffice-ximian/openoffice-ximian-1.3.7.ebuild +++ b/app-office/openoffice-ximian/openoffice-ximian-1.3.7.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-ximian/openoffice-ximian-1.3.7.ebuild,v 1.4 2005/01/16 16:30:11 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.3.7.ebuild,v 1.5 2005/01/16 22:59:19 suka Exp $ # Notes: # @@ -26,7 +26,7 @@ inherit flag-o-matic eutils toolchain-funcs -IUSE="gnome kde java curl zlib nptl" +IUSE="curl gnome hardened java kde nptl zlib" OO_VER="1.1.3" PATCHLEVEL="OOO_1_1_3" @@ -287,6 +287,14 @@ src_unpack() { use gnome && epatch ${FILESDIR}/${OO_VER}/gcc34-gnome.patch fi + #phtread-fix + epatch ${FILESDIR}/${OO_VER}/pthreadlink-fix.patch + + #Fix for hardened + if use hardened; then + epatch ${FILESDIR}/${OO_VER}/hardened-link.patch + fi + einfo "Installing / Scaling Icons" ${PATCHDIR}/bin/scale-icons ${S} || die cp -af ${ICONDIR}/* ${S} || die |