Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F152003283
D1792.id3673.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Flag For Later
Award Token
Size
1 KB
Referenced Files
None
Subscribers
None
D1792.id3673.diff
View Options
Index: editors/openoffice-4/Makefile
===================================================================
--- editors/openoffice-4/Makefile
+++ editors/openoffice-4/Makefile
@@ -91,7 +91,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:bzip2
USE_PERL5= build
WITHOUT_CPU_CFLAGS= true
@@ -252,6 +252,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
Details
Attached
Mime Type
text/plain
Expires
Mon, Apr 13, 1:12 AM (12 h, 43 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31385570
Default Alt Text
D1792.id3673.diff (1 KB)
Attached To
Mode
D1792: Unbreak openoffice-4 build with gcc 4.9
Attached
Detach File
Event Timeline
Log In to Comment