diff options
| -rw-r--r-- | devel/cppunit/buildlink3.mk | 5 | ||||
| -rw-r--r-- | misc/libreoffice/Makefile | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/devel/cppunit/buildlink3.mk b/devel/cppunit/buildlink3.mk index 11412038446..0f78fe968b1 100644 --- a/devel/cppunit/buildlink3.mk +++ b/devel/cppunit/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.10 2017/04/20 08:39:03 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2017/05/01 04:16:12 ryoon Exp $ BUILDLINK_TREE+= cppunit @@ -11,7 +11,4 @@ BUILDLINK_PKGSRCDIR.cppunit?= ../../devel/cppunit BUILDLINK_CPPFLAGS.cppunit+= -I${BUILDLINK_PREFIX.cppunit}/include/cppunit .endif # CPPUNIT_BUILDLINK3_MK -# cppunit enables C++11 so all dependencies must be built the same way -CXXFLAGS+= -std=c++11 - BUILDLINK_TREE+= -cppunit diff --git a/misc/libreoffice/Makefile b/misc/libreoffice/Makefile index 3274d86cc5c..31a381fa2de 100644 --- a/misc/libreoffice/Makefile +++ b/misc/libreoffice/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.109 2017/04/30 01:21:53 ryoon Exp $ +# $NetBSD: Makefile,v 1.110 2017/05/01 04:16:12 ryoon Exp $ VERREL= 5.3.2 VERRC= 2 @@ -14,9 +14,6 @@ HOMEPAGE= http://www.libreoffice.org/ COMMENT= Office productivity suite from The Document Foundation LICENSE= gnu-lgpl-v3 -# devel/cppunit/buildlink3.mk defined -std=c++11 and build fails -BUILDLINK_TRANSFORM+= opt:-std=c++11:-std=gnu++14 - SUBST_CLASSES+= use-bash SUBST_STAGE.use-bash= pre-configure SUBST_MESSAGE.use-bash= Using bash for configure script |