CVS commit: pkgsrc

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Mon May  1 04:16:12 UTC 2017

Modified Files:
        pkgsrc/devel/cppunit: buildlink3.mk
        pkgsrc/misc/libreoffice: Makefile

Log Message:
Fix misc/libreoffice build on netbsd-7/gcc-4.8


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/devel/cppunit/buildlink3.mk
cvs rdiff -u -r1.109 -r1.110 pkgsrc/misc/libreoffice/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/cppunit/buildlink3.mk
diff -u pkgsrc/devel/cppunit/buildlink3.mk:1.10 pkgsrc/devel/cppunit/buildlink3.mk:1.11
--- pkgsrc/devel/cppunit/buildlink3.mk:1.10     Thu Apr 20 08:39:03 2017
+++ pkgsrc/devel/cppunit/buildlink3.mk  Mon May  1 04:16:12 2017
@@ -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?= ../../deve
 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

Index: pkgsrc/misc/libreoffice/Makefile
diff -u pkgsrc/misc/libreoffice/Makefile:1.109 pkgsrc/misc/libreoffice/Makefile:1.110
--- pkgsrc/misc/libreoffice/Makefile:1.109      Sun Apr 30 01:21:53 2017
+++ pkgsrc/misc/libreoffice/Makefile    Mon May  1 04:16:12 2017
@@ -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