pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc Fix misc/libreoffice build on netbsd-7/gcc-4.8



details:   https://anonhg.NetBSD.org/pkgsrc/rev/78d00a2f9dd2
branches:  trunk
changeset: 361965:78d00a2f9dd2
user:      ryoon <ryoon%pkgsrc.org@localhost>
date:      Mon May 01 04:16:12 2017 +0000

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

diffstat:

 devel/cppunit/buildlink3.mk |  5 +----
 misc/libreoffice/Makefile   |  5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)

diffs (36 lines):

diff -r ddffc420b5bb -r 78d00a2f9dd2 devel/cppunit/buildlink3.mk
--- a/devel/cppunit/buildlink3.mk       Mon May 01 00:43:07 2017 +0000
+++ b/devel/cppunit/buildlink3.mk       Mon May 01 04:16:12 2017 +0000
@@ -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_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 -r ddffc420b5bb -r 78d00a2f9dd2 misc/libreoffice/Makefile
--- a/misc/libreoffice/Makefile Mon May 01 00:43:07 2017 +0000
+++ b/misc/libreoffice/Makefile Mon May 01 04:16:12 2017 +0000
@@ -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 @@
 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



Home | Main Index | Thread Index | Old Index