Thu Apr 27 14:10:39 2017 UTC ()
devel/cppunit/buildlink3.mk provides -std=c++11, however misc/libreoffice
uses -std=gnu++14 and build fails. Add workaround.


(ryoon)
diff -r1.107 -r1.108 pkgsrc/misc/libreoffice/Makefile
cvs diff -r1.107 -r1.108 pkgsrc/misc/libreoffice/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/libreoffice/Makefile 2017/04/22 21:03:44 1.107
+++ pkgsrc/misc/libreoffice/Makefile 2017/04/27 14:10:39 1.108
@@ -1,29 +1,32 @@ @@ -1,29 +1,32 @@
1# $NetBSD: Makefile,v 1.107 2017/04/22 21:03:44 adam Exp $ 1# $NetBSD: Makefile,v 1.108 2017/04/27 14:10:39 ryoon Exp $
2 2
3VERREL= 5.3.2 3VERREL= 5.3.2
4VERRC= 2 4VERRC= 2
5VER= ${VERREL}.${VERRC} 5VER= ${VERREL}.${VERRC}
6DISTNAME= libreoffice-${VER} 6DISTNAME= libreoffice-${VER}
7PKGREVISION= 1 7PKGREVISION= 1
8CATEGORIES= misc 8CATEGORIES= misc
9MASTER_SITES= http://download.documentfoundation.org/libreoffice/src/${VERREL}/ 9MASTER_SITES= http://download.documentfoundation.org/libreoffice/src/${VERREL}/
10EXTRACT_SUFX= .tar.xz 10EXTRACT_SUFX= .tar.xz
11 11
12MAINTAINER= ryoon@NetBSD.org 12MAINTAINER= ryoon@NetBSD.org
13HOMEPAGE= http://www.libreoffice.org/ 13HOMEPAGE= http://www.libreoffice.org/
14COMMENT= Office productivity suite from The Document Foundation 14COMMENT= Office productivity suite from The Document Foundation
15LICENSE= gnu-lgpl-v3 15LICENSE= gnu-lgpl-v3
16 16
 17# devel/cppunit/buildlink3.mk defined -std=c++11 and build fails
 18BUILDLINK_TRANSFORM+= opt:-std=c++11:-std=gnu++14
 19
17SUBST_CLASSES+= use-bash 20SUBST_CLASSES+= use-bash
18SUBST_STAGE.use-bash= pre-configure 21SUBST_STAGE.use-bash= pre-configure
19SUBST_MESSAGE.use-bash= Using bash for configure script 22SUBST_MESSAGE.use-bash= Using bash for configure script
20SUBST_FILES.use-bash+= autogen.sh 23SUBST_FILES.use-bash+= autogen.sh
21SUBST_VARS.use-bash+= BASH 24SUBST_VARS.use-bash+= BASH
22 25
23.include "../../mk/bsd.prefs.mk" 26.include "../../mk/bsd.prefs.mk"
24 27
25.if !empty(MACHINE_PLATFORM:MNetBSD*) 28.if !empty(MACHINE_PLATFORM:MNetBSD*)
26pre-build: 29pre-build:
27 cd ${WRKSRC} && ${BUILD_MAKE_CMD} Executable_gengal && ${TOOLS_PLATFORM.paxctl} +m instdir/program/gengal.bin 30 cd ${WRKSRC} && ${BUILD_MAKE_CMD} Executable_gengal && ${TOOLS_PLATFORM.paxctl} +m instdir/program/gengal.bin
28.endif 31.endif
29 32