Author: pfg
Date: Fri Aug 7 15:14:25 2015
New Revision: 1694701
URL: http://svn.apache.org/r1694701
Log:
FreeBSD: Work around clang-3.4 issues.
It is well known that clang-3.4 doesn't build all AOO correctly.
Workaround the issue for FreeBSD 10 which ships with clang-3.4.
The workaround may still be needed for other clang based platforms.
Submitted by: Don Lewis
Modified:
openoffice/trunk/main/connectivity/source/drivers/dbase/makefile.mk
openoffice/trunk/main/solenv/inc/tg_compv.mk
Modified: openoffice/trunk/main/connectivity/source/drivers/dbase/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/source/drivers/dbase/makefile.mk?rev=1694701&r1=1694700&r2=1694701&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/source/drivers/dbase/makefile.mk
(original)
+++ openoffice/trunk/main/connectivity/source/drivers/dbase/makefile.mk Fri Aug
7 15:14:25 2015
@@ -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
Modified: openoffice/trunk/main/solenv/inc/tg_compv.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/inc/tg_compv.mk?rev=1694701&r1=1694700&r2=1694701&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/inc/tg_compv.mk (original)
+++ openoffice/trunk/main/solenv/inc/tg_compv.mk Fri Aug 7 15:14:25 2015
@@ -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
