diff options
Diffstat (limited to 'editors/openoffice-devel/files')
| -rw-r--r-- | editors/openoffice-devel/files/patch-clang34amd64 | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/editors/openoffice-devel/files/patch-clang34amd64 b/editors/openoffice-devel/files/patch-clang34amd64 new file mode 100644 index 000000000000..6fc0a1589633 --- /dev/null +++ b/editors/openoffice-devel/files/patch-clang34amd64 @@ -0,0 +1,27 @@ +--- connectivity/source/drivers/dbase/makefile.mk.orig 2014-09-19 18:15:41 UTC ++++ connectivity/source/drivers/dbase/makefile.mk +@@ -76,7 +76,9 @@ EXCEPTIONSFILES=\ + $(SLO)$/DDriver.obj + + # [kh] ppc linux gcc compiler problem +-.IF "$(OS)$(COM)$(CPUNAME)"=="LINUXGCCPOWERPC" ++# [Don Lewis] clang 3.4 -O2 on amd64 tries to use R_X86_64_PC32 relocation with ++# symbol _ZThn192_N12connectivity4file10OFileTable7acquireEvj ++.IF "$(OS)$(COM)$(CPUNAME)"=="LINUXGCCPOWERPC" || ("$(OS)$(COM)$(CPUNAME)"=="FREEBSDCLANGX86_64" && $(CCNUMVER)>=000300040000 && $(CCNUMVER)<000300050000) + EXCEPTIONSNOOPTFILES= \ + $(SLO)$/DTable.obj + .ELSE +--- solenv/inc/tg_compv.mk.orig 2015-08-05 01:53:01 UTC ++++ solenv/inc/tg_compv.mk +@@ -38,7 +38,11 @@ CFLAGSNUMVERSION_CMD=-dumpversion $(PIPE + .ELIF "$(COM)"=="CLANG" + CFLAGSVERSION=--version + CFLAGSVERSION_CMD=--version | head -n1 | sed -e"s/.*version //" -e"s/ .*//" ++.IF "$(OS)"="FREEBSD" ++CFLAGSNUMVERSION_CMD=${CFLAGSVERSION_CMD} | $(AWK) -v num=true -f $(SOLARENV)/bin/getcompver.awk ++.ELSE + CFLAGSNUMVERSION_CMD=${CFLAGSVERSION_CMD} | sed -e"s/\.//" ++.ENDIF + .ELIF "$(COM)"=="MSC" + CFLAGSVERSION= + CFLAGSVERSION_CMD= $(PIPEERROR) $(AWK) -f $(SOLARENV)/bin/getcompver.awk |