aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Blapp <mbr@FreeBSD.org>2003-03-23 17:09:21 +0000
committerMartin Blapp <mbr@FreeBSD.org>2003-03-23 17:09:21 +0000
commita9f5f15faf910b1ec8b01dcc1825cd783cd8ddff (patch)
treeea3816e6744e2c34f19150fcd962316f61eec2da
parent6289c59c03b7910da5dfae15226ff6574753bec6 (diff)
downloadports-a9f5f15faf910b1ec8b01dcc1825cd783cd8ddff.tar.gz
ports-a9f5f15faf910b1ec8b01dcc1825cd783cd8ddff.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.
Notes
Notes: svn path=/head/; revision=77271
-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