Page MenuHomeFreeBSD
Files F170841320

D1607.id3801.diff
No OneTemporary
Actions

D1607.id3801.diff
View Options

Index: head/editors/openoffice-devel/Makefile
===================================================================
--- head/editors/openoffice-devel/Makefile
+++ head/editors/openoffice-devel/Makefile
@@ -101,7 +101,7 @@
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 @@
.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

File Metadata

Mime Type
text/plain
Expires
Mon, Sep 7, 11:37 PM (6 h, 29 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
38492302
Default Alt Text
D1607.id3801.diff (1 KB)

Event Timeline