From owner-svn-ports-head@FreeBSD.ORG  Tue Feb 17 01:26:18 2015
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id F21A568B;
 Tue, 17 Feb 2015 01:26:17 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id DA691F41;
 Tue, 17 Feb 2015 01:26:17 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1H1QHaC072358;
 Tue, 17 Feb 2015 01:26:17 GMT (envelope-from truckman@FreeBSD.org)
Received: (from truckman@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1H1QH3W072357;
 Tue, 17 Feb 2015 01:26:17 GMT (envelope-from truckman@FreeBSD.org)
Message-Id: <201502170126.t1H1QH3W072357@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: truckman set sender to
 truckman@FreeBSD.org using -f
From: Don Lewis <truckman@FreeBSD.org>
Date: Tue, 17 Feb 2015 01:26:17 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r379132 - head/editors/openoffice-devel
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 17 Feb 2015 01:26:18 -0000

Author: truckman
Date: Tue Feb 17 01:26:17 2015
New Revision: 379132
URL: https://svnweb.freebsd.org/changeset/ports/379132
QAT: https://qat.redports.org/buildarchive/r379132/

Log:
  Switch back to USE_GCC=yes.
  
  Work around this bug <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=65009>
  in g++49 -Os optimzation by using -O0 optimization if we are compiling
  with g++49.
  
  Differential Revision:	https://reviews.freebsd.org/D1607
  Reviewed by:	pfg
  Approved by:	mat (mentor)

Modified:
  head/editors/openoffice-devel/Makefile

Modified: head/editors/openoffice-devel/Makefile
==============================================================================
--- head/editors/openoffice-devel/Makefile	Tue Feb 17 01:16:11 2015	(r379131)
+++ head/editors/openoffice-devel/Makefile	Tue Feb 17 01:26:17 2015	(r379132)
@@ -101,7 +101,7 @@ USE_XORG=	x11 ice xaw xau xext xrender x
 		xi xt xcursor xdamage xcomposite xfixes
 USE_GL=		gl glu
 USE_GSTREAMER=	yes
-USE_GCC=	4.8
+USE_GCC=	yes
 USES+=		bison desktop-file-utils gmake perl5 pkgconfig python tar:xz
 USE_PERL5=	build
 WITHOUT_CPU_CFLAGS=	true
@@ -262,6 +262,11 @@ post-patch:
 .if defined (USE_GCC)
 	${REINPLACE_CMD} -e "s+%%RPATH%%+-Wl,-rpath=${_GCC_RUNTIME}+" ${WRKSRC}/solenv/inc/unxfbsd.mk
 	${REINPLACE_CMD} -e "s+%%RPATH%%+-Wl,-rpath=${_GCC_RUNTIME}+" ${WRKSRC}/solenv/gbuild/platform/freebsd.mk
+	# g++49 -Os sometimes leaves inline class methods undefined
+	if [ ${CXX} = g++49 ]; then \
+		${REINPLACE_CMD} -e "s/ := -Os/ := -O0/" ${WRKSRC}/solenv/gbuild/platform/freebsd.mk; \
+		${REINPLACE_CMD} -e "s/=-Os /=-O0 /" ${WRKSRC}/solenv/inc/unxfbsdi.mk; \
+	fi
 .else
 	${REINPLACE_CMD} -e "s+%%RPATH%%++" ${WRKSRC}/solenv/inc/unxfbsd.mk
 	${REINPLACE_CMD} -e "s+%%RPATH%%++" ${WRKSRC}/solenv/gbuild/platform/freebsd.mk