Date: Sun, 15 Feb 2015 22:30:46 +0000 (UTC) From: Don Lewis <truckman@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r379055 - head/editors/openoffice-4 Message-ID: <201502152230.t1FMUkoB095375@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: truckman Date: Sun Feb 15 22:30:45 2015 New Revision: 379055 URL: https://svnweb.freebsd.org/changeset/ports/379055 QAT: https://qat.redports.org/buildarchive/r379055/ 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/D1792 Approved by: mat (mentor) Modified: head/editors/openoffice-4/Makefile Modified: head/editors/openoffice-4/Makefile ============================================================================== --- head/editors/openoffice-4/Makefile Sun Feb 15 22:11:38 2015 (r379054) +++ head/editors/openoffice-4/Makefile Sun Feb 15 22:30:45 2015 (r379055) @@ -91,7 +91,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:bzip2 USE_PERL5= build WITHOUT_CPU_CFLAGS= true @@ -252,6 +252,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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502152230.t1FMUkoB095375>