diff options
Diffstat (limited to 'editors/openoffice-devel/files/patch-unxfbsd.mk')
| -rw-r--r-- | editors/openoffice-devel/files/patch-unxfbsd.mk | 33 |
1 files changed, 26 insertions, 7 deletions
diff --git a/editors/openoffice-devel/files/patch-unxfbsd.mk b/editors/openoffice-devel/files/patch-unxfbsd.mk index 55a15933769..ad4194f9b1e 100644 --- a/editors/openoffice-devel/files/patch-unxfbsd.mk +++ b/editors/openoffice-devel/files/patch-unxfbsd.mk @@ -1,13 +1,32 @@ ---- solenv/inc/unxfbsd.mk~ 2012-10-31 10:39:44.000000000 +0900 -+++ solenv/inc/unxfbsd.mk 2012-10-31 17:42:59.000000000 +0900 -@@ -80,14 +80,14 @@ +--- solenv/inc/unxfbsd.mk.orig 2014-09-19 18:16:56 UTC ++++ solenv/inc/unxfbsd.mk +@@ -27,7 +27,7 @@ ASM= + AFLAGS= + + SOLAR_JAVA*= +-PICSWITCH*:=-fpic ++PICSWITCH*:=-fPIC + JAVAFLAGSDEBUG=-g + + # Include arch specific makefile. +@@ -49,7 +49,7 @@ JAVAFLAGSDEBUG=-g + #LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter" + + # _PTHREADS is needed for the stl +-CDEFS+=$(PTHREAD_CFLAGS) -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450 ++CDEFS+=$(PTHREAD_CFLAGS) -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 %%HAVE_STL_INCLUDE_PATH%% + + # enable visibility define in "sal/types.h" + .IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" +@@ -86,14 +86,14 @@ CFLAGSENABLESYMBOLS=-g # was temporarily .ENDIF # flags for the C++ Compiler -CFLAGSCC= -pipe $(ARCH_FLAGS) +CFLAGSCC= -pipe $(ARCH_FLAGS) %%RPATH%% # Flags for enabling exception handling - CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs +-CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs ++CFLAGSEXCEPTIONS=-fexceptions # Flags for disabling exception handling CFLAGS_NO_EXCEPTIONS=-fno-exceptions @@ -17,9 +36,9 @@ .IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" CFLAGSCXX += -fvisibility-inlines-hidden .ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" -@@ -145,7 +145,7 @@ - LINKFLAGSRUNPATH_OXT= - LINKFLAGSRUNPATH_BOXT=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN/../../../basis-link/program'\' +@@ -156,7 +156,7 @@ LINKFLAGSRUNPATH_OXT= + LINKFLAGSRUNPATH_BOXT=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN'\' + #LINKFLAGSRUNPATH_BOXT=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN/../../../basis-link/program'\' LINKFLAGSRUNPATH_NONE= -LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGS_SYSBASE) +LINKFLAGS=-Wl,-z,combreloc %%RPATH%% $(LINKFLAGSDEFS) $(LINKFLAGS_SYSBASE) |