diff options
| author | Don Lewis <truckman@FreeBSD.org> | 2015-08-06 22:40:00 +0000 |
|---|---|---|
| committer | Don Lewis <truckman@FreeBSD.org> | 2015-08-06 22:40:00 +0000 |
| commit | 40b3f748c2b09e8e47489b265a5aa9e77f593c67 (patch) | |
| tree | fbfbf634151ca7f284ff58af2f7eea95fdb886f6 /editors/openoffice-devel/files | |
| parent | - Update mail/opendkim to 2.10.3 (diff) | |
Update to SVN revision 1694132, which contains some changes to aid
building with gcc from ports on FreeBSD. Remove the REINPLACE_CMD
patches in the ports Makefile and $FBSD_LDFLAGS from do-build that
are no longer needed for building with gcc in the general case.
Add a patch to disable optimization when compiling one source file
with base clang 3.4 on FreeBSD 10 amd64 to avoid tripping on a compiler
code generation bug. This allows us to build with base clang on
FreeBSD 10 amd64 instead of using the clang35 port.
Fine tune compiler optimization flags when using clang 3.6 on FreeBSD 11
i386 or gcc 4.9 instead of totally disabling optimization. Unbreak
the build with gcc 4.9 on amd64.
A few Makefile cleanups without functional change:
* Combine two .if ${ARCH} == amd64 sections of Makefile
* Merge the pre-configure target into post-extract
* Simplify the code in the do-build target
Approved by: mat (mentor, implicit)
Notes
Notes:
svn path=/head/; revision=393676
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 |