diff options
| author | Don Lewis <truckman@FreeBSD.org> | 2017-11-27 07:28:35 +0000 |
|---|---|---|
| committer | Don Lewis <truckman@FreeBSD.org> | 2017-11-27 07:28:35 +0000 |
| commit | c1527a09a5405522d3e543dd00af51ca22745da5 (patch) | |
| tree | 697fd77a1d23c332333d503057eab9399cd5b0c4 | |
| parent | 135ee7d8c5efb79ee8be7276260064911f43c851 (diff) | |
| download | freebsd-ports-c1527a09a5405522d3e543dd00af51ca22745da5.zip | |
Fix the table wizard in openoffice-base on FreeBSD 10 amd64. One of the
source files triggers a bug in the clang 3.4 code optimizer.
MFH: 2017Q4
| -rw-r--r-- | editors/openoffice-4/Makefile | 1 | ||||
| -rw-r--r-- | editors/openoffice-4/files/patch-framework_Library__fwk.mk | 14 | ||||
| -rw-r--r-- | editors/openoffice-devel/Makefile | 2 | ||||
| -rw-r--r-- | editors/openoffice-devel/files/patch-framework_Library__fwk.mk | 14 |
4 files changed, 30 insertions, 1 deletions
diff --git a/editors/openoffice-4/Makefile b/editors/openoffice-4/Makefile index 0129523a4611..9a47ad8733bf 100644 --- a/editors/openoffice-4/Makefile +++ b/editors/openoffice-4/Makefile @@ -3,6 +3,7 @@ PORTNAME= apache-openoffice PORTVERSION= ${AOOVERSION} +PORTREVISION= 1 CATEGORIES= editors java MASTER_SITES= APACHE/openoffice/${PORTVERSION}/sources \ http://tools.openoffice.org/unowinreg_prebuild/680/:unoreg \ diff --git a/editors/openoffice-4/files/patch-framework_Library__fwk.mk b/editors/openoffice-4/files/patch-framework_Library__fwk.mk new file mode 100644 index 000000000000..5d6e318dcf81 --- /dev/null +++ b/editors/openoffice-4/files/patch-framework_Library__fwk.mk @@ -0,0 +1,14 @@ +--- framework/Library_fwk.mk.orig 2017-10-11 11:40:20 UTC ++++ framework/Library_fwk.mk +@@ -186,4 +186,11 @@ $(eval $(call gb_Library_add_exception_objects,fwk,\ + framework/source/xml/imagesdocumenthandler \ + )) + ++# i126622 - Base 4.1.2 does not open Tables and Queries in Mac OSX ++# Also affects FreeBSD 10.3 with clang 3.4.1. ++# Appears to be a clang optimization bug in versions less than 3.8.0 ++ifeq ($(COM)$(CPUNAME),CLANGX86_64) ++$(call gb_CxxObject_get_target,framework/source/loadenv/loadenv): CXXFLAGS := $(gb_LinkTarget_CXXFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) $(gb_COMPILERNOOPTFLAGS) ++endif ++ + # vim: set noet sw=4 ts=4: diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile index 69c5b2c6a4a9..34948d19ea3e 100644 --- a/editors/openoffice-devel/Makefile +++ b/editors/openoffice-devel/Makefile @@ -3,7 +3,7 @@ PORTNAME= apache-openoffice PORTVERSION= ${AOOVERSION1}.${AOOVERSION2}.${SVNREVISION} -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 4 CATEGORIES= editors java MASTER_SITES= https://dist.apache.org/repos/dist/dev/openoffice/${AOOVERSION}-${AOORC}-r${SVNREVISION}/source/ \ diff --git a/editors/openoffice-devel/files/patch-framework_Library__fwk.mk b/editors/openoffice-devel/files/patch-framework_Library__fwk.mk new file mode 100644 index 000000000000..7750d033fd74 --- /dev/null +++ b/editors/openoffice-devel/files/patch-framework_Library__fwk.mk @@ -0,0 +1,14 @@ +--- framework/Library_fwk.mk.orig 2016-08-29 00:45:25 UTC ++++ framework/Library_fwk.mk +@@ -190,4 +190,11 @@ $(eval $(call gb_Library_add_exception_objects,fwk,\ + framework/source/xml/imagesdocumenthandler \ + )) + ++# i126622 - Base 4.1.2 does not open Tables and Queries in Mac OSX ++# Also affects FreeBSD 10.3 with clang 3.4.1. ++# Appears to be a clang optimization bug in versions less than 3.8.0 ++ifeq ($(COM)$(CPUNAME),CLANGX86_64) ++$(call gb_CxxObject_get_target,framework/source/loadenv/loadenv): T_CXXFLAGS := $(gb_LinkTarget_CXXFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) $(gb_COMPILERNOOPTFLAGS) ++endif ++ + # vim: set noet sw=4 ts=4: |