diff options
| author | truckman <truckman@FreeBSD.org> | 2015-02-16 06:30:45 +0800 |
|---|---|---|
| committer | truckman <truckman@FreeBSD.org> | 2015-02-16 06:30:45 +0800 |
| commit | d673f29cf742126fa9a344c222e9029fd350431a (patch) | |
| tree | 87e5a6150bcd8e3aca62a1de06217842d5ed186d /editors/openoffice-4 | |
| parent | 3834ed46e4af48734a9be331f93f396e224cf1bf (diff) | |
| download | freebsd-ports-gnome-d673f29cf742126fa9a344c222e9029fd350431a.tar.gz freebsd-ports-gnome-d673f29cf742126fa9a344c222e9029fd350431a.tar.zst freebsd-ports-gnome-d673f29cf742126fa9a344c222e9029fd350431a.zip | |
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)
Diffstat (limited to 'editors/openoffice-4')
| -rw-r--r-- | editors/openoffice-4/Makefile | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/editors/openoffice-4/Makefile b/editors/openoffice-4/Makefile index 24f59a976097..5abcd74a6086 100644 --- a/editors/openoffice-4/Makefile +++ b/editors/openoffice-4/Makefile @@ -91,7 +91,7 @@ USE_XORG= x11 ice xaw xau xext xrender xrandr \ 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 |