aboutsummaryrefslogtreecommitdiffstats
path: root/editors
diff options
context:
space:
mode:
authormbr <mbr@FreeBSD.org>2003-03-24 01:09:21 +0800
committermbr <mbr@FreeBSD.org>2003-03-24 01:09:21 +0800
commitf032a387fa3187b7c4e8a8c1e3f6d79e33d24cb6 (patch)
tree1cba7027dab32ca701662ea199616a7d1fe8af7d /editors
parentd30a9ae2e8f18eb71f145640e3fc5ab5283130ac (diff)
downloadfreebsd-ports-gnome-f032a387fa3187b7c4e8a8c1e3f6d79e33d24cb6.tar.gz
freebsd-ports-gnome-f032a387fa3187b7c4e8a8c1e3f6d79e33d24cb6.tar.zst
freebsd-ports-gnome-f032a387fa3187b7c4e8a8c1e3f6d79e33d24cb6.zip
Remove -export-dynamic. This option is not needed at all and
does not work together with the .map files. This is already fixed in the 1.0X OO.org series.
Diffstat (limited to 'editors')
-rw-r--r--editors/openoffice-1.1-devel/files/patch-solenv+inc+unxfbsdi.mk8
-rw-r--r--editors/openoffice-1.1/files/patch-solenv+inc+unxfbsdi.mk8
-rw-r--r--editors/openoffice-2.0-devel/files/patch-solenv+inc+unxfbsdi.mk8
-rw-r--r--editors/openoffice-3-devel/files/patch-solenv+inc+unxfbsdi.mk8
-rw-r--r--editors/openoffice-3/files/patch-solenv+inc+unxfbsdi.mk8
-rw-r--r--editors/openoffice-devel/files/patch-solenv+inc+unxfbsdi.mk8
-rw-r--r--editors/openoffice.org-1.1-devel/files/patch-solenv+inc+unxfbsdi.mk8
-rw-r--r--editors/openoffice.org-1.1/files/patch-solenv+inc+unxfbsdi.mk8
-rw-r--r--editors/openoffice.org-2-RC/files/patch-solenv+inc+unxfbsdi.mk8
-rw-r--r--editors/openoffice.org-2-devel/files/patch-solenv+inc+unxfbsdi.mk8
-rw-r--r--editors/openoffice.org-2.0-devel/files/patch-solenv+inc+unxfbsdi.mk8
-rw-r--r--editors/openoffice.org-2.0/files/patch-solenv+inc+unxfbsdi.mk8
-rw-r--r--editors/openoffice.org-2/files/patch-solenv+inc+unxfbsdi.mk8
-rw-r--r--editors/openoffice.org-3-RC/files/patch-solenv+inc+unxfbsdi.mk8
-rw-r--r--editors/openoffice.org-3-devel/files/patch-solenv+inc+unxfbsdi.mk8
-rw-r--r--editors/openoffice.org-3/files/patch-solenv+inc+unxfbsdi.mk8
-rw-r--r--editors/openoffice.org-vcltesttool/files/patch-solenv+inc+unxfbsdi.mk8
17 files changed, 68 insertions, 68 deletions
diff --git a/editors/openoffice-1.1-devel/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice-1.1-devel/files/patch-solenv+inc+unxfbsdi.mk
index b4764485aa86..4e7bf9ef1ad0 100644
--- a/editors/openoffice-1.1-devel/files/patch-solenv+inc+unxfbsdi.mk
+++ b/editors/openoffice-1.1-devel/files/patch-solenv+inc+unxfbsdi.mk
@@ -115,15 +115,15 @@
-LINKFLAGSAPPGUI= -Wl,-export-dynamic
-LINKFLAGSAPPCUI= -Wl,-export-dynamic
+# name of linker
-+LINK*=$(CC)
++LINK*=$(CXX)
+
+# default linker flags
+# LINKFLAGSRUNPATH*=-Wl,-rpath\''$$ORIGIN'\'
-+LINKFLAGS=-z combreloc $(LINKFLAGSRUNPATH)
++LINKFLAGS=$(LINKFLAGSRUNPATH)
+
+# linker flags for linking applications
-+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-+LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
++LINKFLAGSAPPGUI= -Wl,--noinhibit-exec
++LINKFLAGSAPPCUI= -Wl,--noinhibit-exec
+
+# linker flags for linking shared libraries
LINKFLAGSSHLGUI= -shared
diff --git a/editors/openoffice-1.1/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice-1.1/files/patch-solenv+inc+unxfbsdi.mk
index b4764485aa86..4e7bf9ef1ad0 100644
--- a/editors/openoffice-1.1/files/patch-solenv+inc+unxfbsdi.mk
+++ b/editors/openoffice-1.1/files/patch-solenv+inc+unxfbsdi.mk
@@ -115,15 +115,15 @@
-LINKFLAGSAPPGUI= -Wl,-export-dynamic
-LINKFLAGSAPPCUI= -Wl,-export-dynamic
+# name of linker
-+LINK*=$(CC)
++LINK*=$(CXX)
+
+# default linker flags
+# LINKFLAGSRUNPATH*=-Wl,-rpath\''$$ORIGIN'\'
-+LINKFLAGS=-z combreloc $(LINKFLAGSRUNPATH)
++LINKFLAGS=$(LINKFLAGSRUNPATH)
+
+# linker flags for linking applications
-+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-+LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
++LINKFLAGSAPPGUI= -Wl,--noinhibit-exec
++LINKFLAGSAPPCUI= -Wl,--noinhibit-exec
+
+# linker flags for linking shared libraries
LINKFLAGSSHLGUI= -shared
diff --git a/editors/openoffice-2.0-devel/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice-2.0-devel/files/patch-solenv+inc+unxfbsdi.mk
index b4764485aa86..4e7bf9ef1ad0 100644
--- a/editors/openoffice-2.0-devel/files/patch-solenv+inc+unxfbsdi.mk
+++ b/editors/openoffice-2.0-devel/files/patch-solenv+inc+unxfbsdi.mk
@@ -115,15 +115,15 @@
-LINKFLAGSAPPGUI= -Wl,-export-dynamic
-LINKFLAGSAPPCUI= -Wl,-export-dynamic
+# name of linker
-+LINK*=$(CC)
++LINK*=$(CXX)
+
+# default linker flags
+# LINKFLAGSRUNPATH*=-Wl,-rpath\''$$ORIGIN'\'
-+LINKFLAGS=-z combreloc $(LINKFLAGSRUNPATH)
++LINKFLAGS=$(LINKFLAGSRUNPATH)
+
+# linker flags for linking applications
-+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-+LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
++LINKFLAGSAPPGUI= -Wl,--noinhibit-exec
++LINKFLAGSAPPCUI= -Wl,--noinhibit-exec
+
+# linker flags for linking shared libraries
LINKFLAGSSHLGUI= -shared
diff --git a/editors/openoffice-3-devel/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice-3-devel/files/patch-solenv+inc+unxfbsdi.mk
index b4764485aa86..4e7bf9ef1ad0 100644
--- a/editors/openoffice-3-devel/files/patch-solenv+inc+unxfbsdi.mk
+++ b/editors/openoffice-3-devel/files/patch-solenv+inc+unxfbsdi.mk
@@ -115,15 +115,15 @@
-LINKFLAGSAPPGUI= -Wl,-export-dynamic
-LINKFLAGSAPPCUI= -Wl,-export-dynamic
+# name of linker
-+LINK*=$(CC)
++LINK*=$(CXX)
+
+# default linker flags
+# LINKFLAGSRUNPATH*=-Wl,-rpath\''$$ORIGIN'\'
-+LINKFLAGS=-z combreloc $(LINKFLAGSRUNPATH)
++LINKFLAGS=$(LINKFLAGSRUNPATH)
+
+# linker flags for linking applications
-+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-+LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
++LINKFLAGSAPPGUI= -Wl,--noinhibit-exec
++LINKFLAGSAPPCUI= -Wl,--noinhibit-exec
+
+# linker flags for linking shared libraries
LINKFLAGSSHLGUI= -shared
diff --git a/editors/openoffice-3/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice-3/files/patch-solenv+inc+unxfbsdi.mk
index b4764485aa86..4e7bf9ef1ad0 100644
--- a/editors/openoffice-3/files/patch-solenv+inc+unxfbsdi.mk
+++ b/editors/openoffice-3/files/patch-solenv+inc+unxfbsdi.mk
@@ -115,15 +115,15 @@
-LINKFLAGSAPPGUI= -Wl,-export-dynamic
-LINKFLAGSAPPCUI= -Wl,-export-dynamic
+# name of linker
-+LINK*=$(CC)
++LINK*=$(CXX)
+
+# default linker flags
+# LINKFLAGSRUNPATH*=-Wl,-rpath\''$$ORIGIN'\'
-+LINKFLAGS=-z combreloc $(LINKFLAGSRUNPATH)
++LINKFLAGS=$(LINKFLAGSRUNPATH)
+
+# linker flags for linking applications
-+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-+LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
++LINKFLAGSAPPGUI= -Wl,--noinhibit-exec
++LINKFLAGSAPPCUI= -Wl,--noinhibit-exec
+
+# linker flags for linking shared libraries
LINKFLAGSSHLGUI= -shared
diff --git a/editors/openoffice-devel/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice-devel/files/patch-solenv+inc+unxfbsdi.mk
index b4764485aa86..4e7bf9ef1ad0 100644
--- a/editors/openoffice-devel/files/patch-solenv+inc+unxfbsdi.mk
+++ b/editors/openoffice-devel/files/patch-solenv+inc+unxfbsdi.mk
@@ -115,15 +115,15 @@
-LINKFLAGSAPPGUI= -Wl,-export-dynamic
-LINKFLAGSAPPCUI= -Wl,-export-dynamic
+# name of linker
-+LINK*=$(CC)
++LINK*=$(CXX)
+
+# default linker flags
+# LINKFLAGSRUNPATH*=-Wl,-rpath\''$$ORIGIN'\'
-+LINKFLAGS=-z combreloc $(LINKFLAGSRUNPATH)
++LINKFLAGS=$(LINKFLAGSRUNPATH)
+
+# linker flags for linking applications
-+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-+LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
++LINKFLAGSAPPGUI= -Wl,--noinhibit-exec
++LINKFLAGSAPPCUI= -Wl,--noinhibit-exec
+
+# linker flags for linking shared libraries
LINKFLAGSSHLGUI= -shared
diff --git a/editors/openoffice.org-1.1-devel/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-1.1-devel/files/patch-solenv+inc+unxfbsdi.mk
index b4764485aa86..4e7bf9ef1ad0 100644
--- a/editors/openoffice.org-1.1-devel/files/patch-solenv+inc+unxfbsdi.mk
+++ b/editors/openoffice.org-1.1-devel/files/patch-solenv+inc+unxfbsdi.mk
@@ -115,15 +115,15 @@
-LINKFLAGSAPPGUI= -Wl,-export-dynamic
-LINKFLAGSAPPCUI= -Wl,-export-dynamic
+# name of linker
-+LINK*=$(CC)
++LINK*=$(CXX)
+
+# default linker flags
+# LINKFLAGSRUNPATH*=-Wl,-rpath\''$$ORIGIN'\'
-+LINKFLAGS=-z combreloc $(LINKFLAGSRUNPATH)
++LINKFLAGS=$(LINKFLAGSRUNPATH)
+
+# linker flags for linking applications
-+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-+LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
++LINKFLAGSAPPGUI= -Wl,--noinhibit-exec
++LINKFLAGSAPPCUI= -Wl,--noinhibit-exec
+
+# linker flags for linking shared libraries
LINKFLAGSSHLGUI= -shared
diff --git a/editors/openoffice.org-1.1/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-1.1/files/patch-solenv+inc+unxfbsdi.mk
index b4764485aa86..4e7bf9ef1ad0 100644
--- a/editors/openoffice.org-1.1/files/patch-solenv+inc+unxfbsdi.mk
+++ b/editors/openoffice.org-1.1/files/patch-solenv+inc+unxfbsdi.mk
@@ -115,15 +115,15 @@
-LINKFLAGSAPPGUI= -Wl,-export-dynamic
-LINKFLAGSAPPCUI= -Wl,-export-dynamic
+# name of linker
-+LINK*=$(CC)
++LINK*=$(CXX)
+
+# default linker flags
+# LINKFLAGSRUNPATH*=-Wl,-rpath\''$$ORIGIN'\'
-+LINKFLAGS=-z combreloc $(LINKFLAGSRUNPATH)
++LINKFLAGS=$(LINKFLAGSRUNPATH)
+
+# linker flags for linking applications
-+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-+LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
++LINKFLAGSAPPGUI= -Wl,--noinhibit-exec
++LINKFLAGSAPPCUI= -Wl,--noinhibit-exec
+
+# linker flags for linking shared libraries
LINKFLAGSSHLGUI= -shared
diff --git a/editors/openoffice.org-2-RC/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-2-RC/files/patch-solenv+inc+unxfbsdi.mk
index b4764485aa86..4e7bf9ef1ad0 100644
--- a/editors/openoffice.org-2-RC/files/patch-solenv+inc+unxfbsdi.mk
+++ b/editors/openoffice.org-2-RC/files/patch-solenv+inc+unxfbsdi.mk
@@ -115,15 +115,15 @@
-LINKFLAGSAPPGUI= -Wl,-export-dynamic
-LINKFLAGSAPPCUI= -Wl,-export-dynamic
+# name of linker
-+LINK*=$(CC)
++LINK*=$(CXX)
+
+# default linker flags
+# LINKFLAGSRUNPATH*=-Wl,-rpath\''$$ORIGIN'\'
-+LINKFLAGS=-z combreloc $(LINKFLAGSRUNPATH)
++LINKFLAGS=$(LINKFLAGSRUNPATH)
+
+# linker flags for linking applications
-+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-+LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
++LINKFLAGSAPPGUI= -Wl,--noinhibit-exec
++LINKFLAGSAPPCUI= -Wl,--noinhibit-exec
+
+# linker flags for linking shared libraries
LINKFLAGSSHLGUI= -shared
diff --git a/editors/openoffice.org-2-devel/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-2-devel/files/patch-solenv+inc+unxfbsdi.mk
index b4764485aa86..4e7bf9ef1ad0 100644
--- a/editors/openoffice.org-2-devel/files/patch-solenv+inc+unxfbsdi.mk
+++ b/editors/openoffice.org-2-devel/files/patch-solenv+inc+unxfbsdi.mk
@@ -115,15 +115,15 @@
-LINKFLAGSAPPGUI= -Wl,-export-dynamic
-LINKFLAGSAPPCUI= -Wl,-export-dynamic
+# name of linker
-+LINK*=$(CC)
++LINK*=$(CXX)
+
+# default linker flags
+# LINKFLAGSRUNPATH*=-Wl,-rpath\''$$ORIGIN'\'
-+LINKFLAGS=-z combreloc $(LINKFLAGSRUNPATH)
++LINKFLAGS=$(LINKFLAGSRUNPATH)
+
+# linker flags for linking applications
-+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-+LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
++LINKFLAGSAPPGUI= -Wl,--noinhibit-exec
++LINKFLAGSAPPCUI= -Wl,--noinhibit-exec
+
+# linker flags for linking shared libraries
LINKFLAGSSHLGUI= -shared
diff --git a/editors/openoffice.org-2.0-devel/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-2.0-devel/files/patch-solenv+inc+unxfbsdi.mk
index b4764485aa86..4e7bf9ef1ad0 100644
--- a/editors/openoffice.org-2.0-devel/files/patch-solenv+inc+unxfbsdi.mk
+++ b/editors/openoffice.org-2.0-devel/files/patch-solenv+inc+unxfbsdi.mk
@@ -115,15 +115,15 @@
-LINKFLAGSAPPGUI= -Wl,-export-dynamic
-LINKFLAGSAPPCUI= -Wl,-export-dynamic
+# name of linker
-+LINK*=$(CC)
++LINK*=$(CXX)
+
+# default linker flags
+# LINKFLAGSRUNPATH*=-Wl,-rpath\''$$ORIGIN'\'
-+LINKFLAGS=-z combreloc $(LINKFLAGSRUNPATH)
++LINKFLAGS=$(LINKFLAGSRUNPATH)
+
+# linker flags for linking applications
-+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-+LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
++LINKFLAGSAPPGUI= -Wl,--noinhibit-exec
++LINKFLAGSAPPCUI= -Wl,--noinhibit-exec
+
+# linker flags for linking shared libraries
LINKFLAGSSHLGUI= -shared
diff --git a/editors/openoffice.org-2.0/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-2.0/files/patch-solenv+inc+unxfbsdi.mk
index b4764485aa86..4e7bf9ef1ad0 100644
--- a/editors/openoffice.org-2.0/files/patch-solenv+inc+unxfbsdi.mk
+++ b/editors/openoffice.org-2.0/files/patch-solenv+inc+unxfbsdi.mk
@@ -115,15 +115,15 @@
-LINKFLAGSAPPGUI= -Wl,-export-dynamic
-LINKFLAGSAPPCUI= -Wl,-export-dynamic
+# name of linker
-+LINK*=$(CC)
++LINK*=$(CXX)
+
+# default linker flags
+# LINKFLAGSRUNPATH*=-Wl,-rpath\''$$ORIGIN'\'
-+LINKFLAGS=-z combreloc $(LINKFLAGSRUNPATH)
++LINKFLAGS=$(LINKFLAGSRUNPATH)
+
+# linker flags for linking applications
-+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-+LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
++LINKFLAGSAPPGUI= -Wl,--noinhibit-exec
++LINKFLAGSAPPCUI= -Wl,--noinhibit-exec
+
+# linker flags for linking shared libraries
LINKFLAGSSHLGUI= -shared
diff --git a/editors/openoffice.org-2/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-2/files/patch-solenv+inc+unxfbsdi.mk
index b4764485aa86..4e7bf9ef1ad0 100644
--- a/editors/openoffice.org-2/files/patch-solenv+inc+unxfbsdi.mk
+++ b/editors/openoffice.org-2/files/patch-solenv+inc+unxfbsdi.mk
@@ -115,15 +115,15 @@
-LINKFLAGSAPPGUI= -Wl,-export-dynamic
-LINKFLAGSAPPCUI= -Wl,-export-dynamic
+# name of linker
-+LINK*=$(CC)
++LINK*=$(CXX)
+
+# default linker flags
+# LINKFLAGSRUNPATH*=-Wl,-rpath\''$$ORIGIN'\'
-+LINKFLAGS=-z combreloc $(LINKFLAGSRUNPATH)
++LINKFLAGS=$(LINKFLAGSRUNPATH)
+
+# linker flags for linking applications
-+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-+LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
++LINKFLAGSAPPGUI= -Wl,--noinhibit-exec
++LINKFLAGSAPPCUI= -Wl,--noinhibit-exec
+
+# linker flags for linking shared libraries
LINKFLAGSSHLGUI= -shared
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 b4764485aa86..4e7bf9ef1ad0 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
@@ -115,15 +115,15 @@
-LINKFLAGSAPPGUI= -Wl,-export-dynamic
-LINKFLAGSAPPCUI= -Wl,-export-dynamic
+# name of linker
-+LINK*=$(CC)
++LINK*=$(CXX)
+
+# default linker flags
+# LINKFLAGSRUNPATH*=-Wl,-rpath\''$$ORIGIN'\'
-+LINKFLAGS=-z combreloc $(LINKFLAGSRUNPATH)
++LINKFLAGS=$(LINKFLAGSRUNPATH)
+
+# linker flags for linking applications
-+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-+LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
++LINKFLAGSAPPGUI= -Wl,--noinhibit-exec
++LINKFLAGSAPPCUI= -Wl,--noinhibit-exec
+
+# linker flags for linking shared libraries
LINKFLAGSSHLGUI= -shared
diff --git a/editors/openoffice.org-3-devel/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-3-devel/files/patch-solenv+inc+unxfbsdi.mk
index b4764485aa86..4e7bf9ef1ad0 100644
--- a/editors/openoffice.org-3-devel/files/patch-solenv+inc+unxfbsdi.mk
+++ b/editors/openoffice.org-3-devel/files/patch-solenv+inc+unxfbsdi.mk
@@ -115,15 +115,15 @@
-LINKFLAGSAPPGUI= -Wl,-export-dynamic
-LINKFLAGSAPPCUI= -Wl,-export-dynamic
+# name of linker
-+LINK*=$(CC)
++LINK*=$(CXX)
+
+# default linker flags
+# LINKFLAGSRUNPATH*=-Wl,-rpath\''$$ORIGIN'\'
-+LINKFLAGS=-z combreloc $(LINKFLAGSRUNPATH)
++LINKFLAGS=$(LINKFLAGSRUNPATH)
+
+# linker flags for linking applications
-+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-+LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
++LINKFLAGSAPPGUI= -Wl,--noinhibit-exec
++LINKFLAGSAPPCUI= -Wl,--noinhibit-exec
+
+# linker flags for linking shared libraries
LINKFLAGSSHLGUI= -shared
diff --git a/editors/openoffice.org-3/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-3/files/patch-solenv+inc+unxfbsdi.mk
index b4764485aa86..4e7bf9ef1ad0 100644
--- a/editors/openoffice.org-3/files/patch-solenv+inc+unxfbsdi.mk
+++ b/editors/openoffice.org-3/files/patch-solenv+inc+unxfbsdi.mk
@@ -115,15 +115,15 @@
-LINKFLAGSAPPGUI= -Wl,-export-dynamic
-LINKFLAGSAPPCUI= -Wl,-export-dynamic
+# name of linker
-+LINK*=$(CC)
++LINK*=$(CXX)
+
+# default linker flags
+# LINKFLAGSRUNPATH*=-Wl,-rpath\''$$ORIGIN'\'
-+LINKFLAGS=-z combreloc $(LINKFLAGSRUNPATH)
++LINKFLAGS=$(LINKFLAGSRUNPATH)
+
+# linker flags for linking applications
-+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-+LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
++LINKFLAGSAPPGUI= -Wl,--noinhibit-exec
++LINKFLAGSAPPCUI= -Wl,--noinhibit-exec
+
+# linker flags for linking shared libraries
LINKFLAGSSHLGUI= -shared
diff --git a/editors/openoffice.org-vcltesttool/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-vcltesttool/files/patch-solenv+inc+unxfbsdi.mk
index b4764485aa86..4e7bf9ef1ad0 100644
--- a/editors/openoffice.org-vcltesttool/files/patch-solenv+inc+unxfbsdi.mk
+++ b/editors/openoffice.org-vcltesttool/files/patch-solenv+inc+unxfbsdi.mk
@@ -115,15 +115,15 @@
-LINKFLAGSAPPGUI= -Wl,-export-dynamic
-LINKFLAGSAPPCUI= -Wl,-export-dynamic
+# name of linker
-+LINK*=$(CC)
++LINK*=$(CXX)
+
+# default linker flags
+# LINKFLAGSRUNPATH*=-Wl,-rpath\''$$ORIGIN'\'
-+LINKFLAGS=-z combreloc $(LINKFLAGSRUNPATH)
++LINKFLAGS=$(LINKFLAGSRUNPATH)
+
+# linker flags for linking applications
-+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-+LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
++LINKFLAGSAPPGUI= -Wl,--noinhibit-exec
++LINKFLAGSAPPCUI= -Wl,--noinhibit-exec
+
+# linker flags for linking shared libraries
LINKFLAGSSHLGUI= -shared