diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2012-11-02 16:39:20 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2012-11-02 16:39:20 +0000 |
| commit | ebb7a3ef3be388b7b8524849abdee081ca357e09 (patch) | |
| tree | 2889ac8d05e79cdf5d81fc89127758a24e07a130 /editors/openoffice-3-devel/files/patch-unxfbsd.mk | |
| parent | - Remove DEPRECATED (diff) | |
Update to svn 1403191.
Feature safe: yes
Notes
Notes:
svn path=/head/; revision=306869
Diffstat (limited to '')
| -rw-r--r-- | editors/openoffice-3-devel/files/patch-unxfbsd.mk | 31 |
1 files changed, 8 insertions, 23 deletions
diff --git a/editors/openoffice-3-devel/files/patch-unxfbsd.mk b/editors/openoffice-3-devel/files/patch-unxfbsd.mk index 76b9d3969704..55a159337693 100644 --- a/editors/openoffice-3-devel/files/patch-unxfbsd.mk +++ b/editors/openoffice-3-devel/files/patch-unxfbsd.mk @@ -1,10 +1,10 @@ ---- solenv/inc/unxfbsd.mk.orig 2011-12-21 09:47:20.000000000 +0900 -+++ solenv/inc/unxfbsd.mk 2011-12-25 20:48:29.000000000 +0900 -@@ -84,14 +84,14 @@ +--- 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 @@ .ENDIF # flags for the C++ Compiler --CFLAGSCC= -pipe $(ARCH_FLAGS) +-CFLAGSCC= -pipe $(ARCH_FLAGS) +CFLAGSCC= -pipe $(ARCH_FLAGS) %%RPATH%% # Flags for enabling exception handling CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs @@ -12,31 +12,16 @@ CFLAGS_NO_EXCEPTIONS=-fno-exceptions # -fpermissive should be removed as soon as possible --CFLAGSCXX= -pipe $(ARCH_FLAGS) +-CFLAGSCXX= -pipe $(ARCH_FLAGS) +CFLAGSCXX= -pipe $(ARCH_FLAGS) %%RPATH%% .IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" CFLAGSCXX += -fvisibility-inlines-hidden .ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" -@@ -140,16 +140,16 @@ - LINKFLAGS_SYSBASE:=-Wl,--sysroot=$(SYSBASE) - .ENDIF # "$(SYSBASE)"!="" - LINKFLAGSDEFS*=-Wl,-z,defs --LINKFLAGSRUNPATH_URELIB=-Wl,-rpath,\''$$ORIGIN'\' --LINKFLAGSRUNPATH_UREBIN=-Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\' -+LINKFLAGSRUNPATH_URELIB=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN'\' -+LINKFLAGSRUNPATH_UREBIN=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\' - #TODO: drop $ORIGIN once no URE executable is also shipped in OOo --LINKFLAGSRUNPATH_OOO=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\' --LINKFLAGSRUNPATH_SDK=-Wl,-rpath,\''$$ORIGIN/../../ure-link/lib'\' --LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\' -+LINKFLAGSRUNPATH_OOO=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\' -+LINKFLAGSRUNPATH_SDK=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN/../../ure-link/lib'\' -+LINKFLAGSRUNPATH_BRAND=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\' +@@ -145,7 +145,7 @@ LINKFLAGSRUNPATH_OXT= --LINKFLAGSRUNPATH_BOXT=-Wl,-rpath,\''$$ORIGIN/../../../basis-link/program'\' -+LINKFLAGSRUNPATH_BOXT=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN/../../../basis-link/program'\' + LINKFLAGSRUNPATH_BOXT=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN/../../../basis-link/program'\' LINKFLAGSRUNPATH_NONE= --LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGS_SYSBASE) +-LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGS_SYSBASE) +LINKFLAGS=-Wl,-z,combreloc %%RPATH%% $(LINKFLAGSDEFS) $(LINKFLAGS_SYSBASE) # linker flags for linking applications |