From 6e1d596baa6f7214dd053b48dafb2700f500a97f Mon Sep 17 00:00:00 2001
From: Martin Blapp <mbr@FreeBSD.org>
Date: Wed, 31 Jul 2002 10:06:52 +0000
Subject: Remove probematic -export-dynamic flag, which could lead to namespace
 collisions. Add missing symbols to addsym.awk, so -export-dynamic gets
 obsolete.

Submitted by:	kan
---
 .../openoffice.org-3-RC/files/patch-solenv+bin+addsym.awk    | 10 ++++++++++
 .../openoffice.org-3-RC/files/patch-solenv+inc+unxfbsdi.mk   | 12 ++++++------
 2 files changed, 16 insertions(+), 6 deletions(-)
 create mode 100644 editors/openoffice.org-3-RC/files/patch-solenv+bin+addsym.awk

(limited to 'editors/openoffice.org-3-RC')

diff --git a/editors/openoffice.org-3-RC/files/patch-solenv+bin+addsym.awk b/editors/openoffice.org-3-RC/files/patch-solenv+bin+addsym.awk
new file mode 100644
index 000000000000..d4b9daeb8a48
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/patch-solenv+bin+addsym.awk
@@ -0,0 +1,10 @@
+--- ../solenv/bin/addsym.awk.kan	Sat Jul 27 10:10:19 2002
++++ ../solenv/bin/addsym.awk	Thu Jul 25 14:49:30 2002
+@@ -62,6 +62,7 @@
+ BEGIN { global_found = "false" }
+ /[ \t]*local:/ { global_found = "false" }
+ global_found == "true"  { 
++    print "\t\tGetVersionInfo;"
+     print "\t\t_ZTS*;"
+     print "\t\t_ZTI*;"
+     global_found = "false" }
diff --git a/editors/openoffice.org-3-RC/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-3-RC/files/patch-solenv+inc+unxfbsdi.mk
index d9a06e4a004f..b189474e5f82 100644
--- a/editors/openoffice.org-3-RC/files/patch-solenv+inc+unxfbsdi.mk
+++ b/editors/openoffice.org-3-RC/files/patch-solenv+inc+unxfbsdi.mk
@@ -120,16 +120,16 @@
 +
 +LINK=$(CXX)
  LINKFLAGS=
+-LINKFLAGSAPPGUI= -Wl,-export-dynamic
+-LINKFLAGSAPPCUI= -Wl,-export-dynamic
 +
 +# linker flags for linking applications
- LINKFLAGSAPPGUI= -Wl,-export-dynamic
- LINKFLAGSAPPCUI= -Wl,-export-dynamic
--LINKFLAGSSHLGUI= -shared
--LINKFLAGSSHLCUI= -shared
++LINKFLAGSAPPGUI= 
++LINKFLAGSAPPCUI= 
 +
 +# linker flags for linking shared libraries
-+LINKFLAGSSHLGUI= -shared -Wl,-export-dynamic
-+LINKFLAGSSHLCUI= -shared -Wl,-export-dynamic
+ LINKFLAGSSHLGUI= -shared
+ LINKFLAGSSHLCUI= -shared
  LINKFLAGSTACK=
  LINKFLAGSPROF=
  LINKFLAGSDEBUG=-g
-- 
cgit v1.2.3