svn commit: r454935 - in head/editors: openoffice-4 openoffice-4/files openoffice-devel openoffice-devel/files

[Don Lewis]

Author: truckman
Date: Mon Nov 27 07:28:35 2017
New Revision: 454935
URL: https://svnweb.freebsd.org/changeset/ports/454935

Log:
  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

Added:
  head/editors/openoffice-4/files/patch-framework_Library__fwk.mk   (contents, props changed)
  head/editors/openoffice-devel/files/patch-framework_Library__fwk.mk   (contents, props changed)
Modified:
  head/editors/openoffice-4/Makefile
  head/editors/openoffice-devel/Makefile

Modified: head/editors/openoffice-4/Makefile
==============================================================================
--- head/editors/openoffice-4/Makefile	Mon Nov 27 06:49:04 2017	(r454934)
+++ head/editors/openoffice-4/Makefile	Mon Nov 27 07:28:35 2017	(r454935)
@@ -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 \

Added: head/editors/openoffice-4/files/patch-framework_Library__fwk.mk
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/editors/openoffice-4/files/patch-framework_Library__fwk.mk	Mon Nov 27 07:28:35 2017	(r454935)
@@ -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:

Modified: head/editors/openoffice-devel/Makefile
==============================================================================
--- head/editors/openoffice-devel/Makefile	Mon Nov 27 06:49:04 2017	(r454934)
+++ head/editors/openoffice-devel/Makefile	Mon Nov 27 07:28:35 2017	(r454935)
@@ -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/ \

Added: head/editors/openoffice-devel/files/patch-framework_Library__fwk.mk
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/editors/openoffice-devel/files/patch-framework_Library__fwk.mk	Mon Nov 27 07:28:35 2017	(r454935)
@@ -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: