diff options
| author | Martin Blapp <mbr@FreeBSD.org> | 2002-07-31 10:06:52 +0000 |
|---|---|---|
| committer | Martin Blapp <mbr@FreeBSD.org> | 2002-07-31 10:06:52 +0000 |
| commit | 6e1d596baa6f7214dd053b48dafb2700f500a97f (patch) | |
| tree | b06aded04dfac073ce7384f54f066ab692b60247 /editors/openoffice-1.0/files | |
| parent | Fix i18n related crash. This may be only a workaround, a better solution (diff) | |
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
Notes
Notes:
svn path=/head/; revision=63788
Diffstat (limited to 'editors/openoffice-1.0/files')
4 files changed, 32 insertions, 12 deletions
diff --git a/editors/openoffice-1.0/files/patch-solenv+bin+addsym.awk b/editors/openoffice-1.0/files/patch-solenv+bin+addsym.awk new file mode 100644 index 000000000000..d4b9daeb8a48 --- /dev/null +++ b/editors/openoffice-1.0/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-1.0/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice-1.0/files/patch-solenv+inc+unxfbsdi.mk index d9a06e4a004f..b189474e5f82 100644 --- a/editors/openoffice-1.0/files/patch-solenv+inc+unxfbsdi.mk +++ b/editors/openoffice-1.0/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 diff --git a/editors/openoffice-1.0/files/patch-solenv::bin::addsym.awk b/editors/openoffice-1.0/files/patch-solenv::bin::addsym.awk new file mode 100644 index 000000000000..d4b9daeb8a48 --- /dev/null +++ b/editors/openoffice-1.0/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-1.0/files/patch-solenv::inc::unxfbsdi.mk b/editors/openoffice-1.0/files/patch-solenv::inc::unxfbsdi.mk index d9a06e4a004f..b189474e5f82 100644 --- a/editors/openoffice-1.0/files/patch-solenv::inc::unxfbsdi.mk +++ b/editors/openoffice-1.0/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 |