aboutsummaryrefslogtreecommitdiff
path: root/editors/openoffice-4/files/patch-freebsd.mk
diff options
context:
space:
mode:
Diffstat (limited to 'editors/openoffice-4/files/patch-freebsd.mk')
-rw-r--r--editors/openoffice-4/files/patch-freebsd.mk14
1 files changed, 11 insertions, 3 deletions
diff --git a/editors/openoffice-4/files/patch-freebsd.mk b/editors/openoffice-4/files/patch-freebsd.mk
index ae9ea3630f0c..c8edec5029cf 100644
--- a/editors/openoffice-4/files/patch-freebsd.mk
+++ b/editors/openoffice-4/files/patch-freebsd.mk
@@ -4,15 +4,23 @@
-fvisibility-inlines-hidden \
-fvisibility=hidden \
-pipe \
-+ %%HAVE_STL_INCLUDE_PATH%% \
++ -DHAVE_STL_INCLUDE_PATH \
ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE)
gb_CFLAGS_WERROR := -Werror
-@@ -121,6 +122,7 @@ gb_LinkTarget_LDFLAGS += \
+@@ -110,7 +111,6 @@ endif
+ gb_LinkTarget_EXCEPTIONFLAGS := \
+ -DEXCEPTIONS_ON \
+ -fexceptions \
+- -fno-enforce-eh-specs \
+
+ gb_LinkTarget_NOEXCEPTIONFLAGS := \
+ -DEXCEPTIONS_OFF \
+@@ -121,6 +121,7 @@ gb_LinkTarget_LDFLAGS += \
-Wl,-z,combreloc \
-Wl,-z,defs \
$(subst -L../lib , ,$(SOLARLIB)) \
-+ %%RPATH%% \
++ ${FBSD_LDFLAGS} \
\
ifeq ($(HAVE_LD_HASH_STYLE),TRUE)