Fixes for hardened-gccs, trying to solve bug #52642

Package-Manager: portage-2.0.51-r13

5 files changed, 66 insertions, 5 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 90d71ad83145..806196e9aa30 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,11 @@
 # 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.100 2005/01/16 20:07:53 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.101 2005/01/16 23:18:51 suka Exp $
+
+  17 Jan 2005; Andreas Proschofsky <suka@gentoo.org>
+  +files/1.1.4/hardened-link.patch, +files/1.1.4/pthreadlink-fix.patch:
+  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-1.1.4.ebuild:
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index b7de91558a47..a3e5ac1f76d7 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,6 +1,6 @@
-MD5 c2cb6deb196ffbc09cf605e98dc3164d openoffice-1.1.4.ebuild 16265
+MD5 5216b6777b9cd64a3e5b281fc402ac00 openoffice-1.1.4.ebuild 16431
 MD5 db4fc1842f4f355e5c4c875ef6b61fdc openoffice-1.1.3.ebuild 15689
-MD5 5e5ec7e7f6e39dd02b6bfcc61822bddb ChangeLog 21953
+MD5 9bf2efdb8775bb710a0a0c476494bf35 ChangeLog 22196
 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
 MD5 fd065af92828cda546d797e6c86d102b files/digest-openoffice-1.1.3 73
 MD5 b2cb01ba0d5824f2892c150dce1d8771 files/digest-openoffice-1.1.4 325
@@ -13,8 +13,10 @@ MD5 5b5b02ecb719c0a553b740edd3544bc7 files/1.1.4/ooffice-wrapper-1.3 9471
 MD5 ffcbf659ca6f54e8e15401cced99af77 files/1.1.4/gcc-instlib.patch 393
 MD5 35601b7efe487b346f78d43c23e2f8f3 files/1.1.4/openoffice-java.patch 2092
 MD5 24035033f41d743378e16582c2e51469 files/1.1.4/javafix.patch 1382
+MD5 ddb36dfd1d142b8a03850e3bee62a8c3 files/1.1.4/hardened-link.patch 576
 MD5 a9cbc34e9462f6b64ca9e564c3b3a084 files/1.1.4/gcc34-nojava-fix.patch 329
 MD5 bf7df7ebe1373f6e2e5bd1e0425657bd files/1.1.4/gcc34-nptl-fix.patch 618
+MD5 fd1c64677627b46e5528f72564bcc8fd files/1.1.4/pthreadlink-fix.patch 1133
 MD5 cd0429c945d4f2e1fbbb9fd5322a6c2b files/1.1.4/freetype-217.patch 766
 MD5 6f7ff745a5659e605fb05206914ab344 files/1.1.4/STLport-vector.patch 1472
 MD5 a9233bc0091b925de38145108267b949 files/1.1.4/newstlportfix.patch 3638
diff --git a/app-office/openoffice/files/1.1.4/hardened-link.patch b/app-office/openoffice/files/1.1.4/hardened-link.patch
new file mode 100644
index 000000000000..83c707dc106d
--- /dev/null
+++ b/app-office/openoffice/files/1.1.4/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/files/1.1.4/pthreadlink-fix.patch b/app-office/openoffice/files/1.1.4/pthreadlink-fix.patch
new file mode 100644
index 000000000000..ffd0a647faa8
--- /dev/null
+++ b/app-office/openoffice/files/1.1.4/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=-z combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
++LINKFLAGS=-Wl,-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/openoffice-1.1.4.ebuild b/app-office/openoffice/openoffice-1.1.4.ebuild
index 875897aa8f80..092bfead6338 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.7 2005/01/16 20:07:53 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1.4.ebuild,v 1.8 2005/01/16 23:18:51 suka Exp $
 
 # Notes:
 #
@@ -26,7 +26,7 @@
 
 inherit flag-o-matic eutils toolchain-funcs
 
-IUSE="gnome kde java curl nptl zlib"
+IUSE="curl gnome hardened java kde nptl zlib"
 
 LOC="/opt"
 INSTDIR="${LOC}/OpenOffice.org"
@@ -242,6 +242,14 @@ src_unpack() {
 	#Another java problem
 	epatch ${FILESDIR}/${PV}/javafix.patch
 
+	#phtread-fix
+	epatch ${FILESDIR}/${PV}/pthreadlink-fix.patch
+
+	#Fix for hardened
+	if use hardened; then
+		epatch ${FILESDIR}/${PV}/hardened-link.patch
+	fi
+
 	# GCC 3.4.x fixes
 	if [ "$(gcc-version)" = "3.4" ]
 	then