Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1547486539288230"
MIME-Version: 1.0
Date: Mon, 14 Jan 2019 17:22:19 +0000
From: "Greg Troxel" <gdt@netbsd.org>
Subject: CVS commit: pkgsrc/www/nghttp2
To: pkgsrc-changes@NetBSD.org
Reply-To: gdt@netbsd.org
Message-Id: <20190114172219.1BB74FB16@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1547486539288230
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	gdt
Date:		Mon Jan 14 17:22:19 UTC 2019

Modified Files:
	pkgsrc/www/nghttp2: Makefile options.mk

Log Message:
nghttp2: Rototill USE_LANGUAGES and make granular per option

Back out the previous build fix.

The base package does not even need C++, so drop from USE_LANGUAGES,
and remove GCC_REQD.  Builds on netbsd-7/amd64 with gcc 4.8.

Both options build C++ code.  Add c++14 to USE_LANGUAGES and 6 to
GCC_REQD, following upstream documentation.


To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 pkgsrc/www/nghttp2/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/www/nghttp2/options.mk

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


--_----------=_1547486539288230
Content-Disposition: inline
Content-Length: 2306
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/www/nghttp2/Makefile
diff -u pkgsrc/www/nghttp2/Makefile:1.47 pkgsrc/www/nghttp2/Makefile:1.48
--- pkgsrc/www/nghttp2/Makefile:1.47	Fri Jan  4 14:52:43 2019
+++ pkgsrc/www/nghttp2/Makefile	Mon Jan 14 17:22:18 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.47 2019/01/04 14:52:43 gdt Exp $
+# $NetBSD: Makefile,v 1.48 2019/01/14 17:22:18 gdt Exp $
 
 DISTNAME=	nghttp2-1.35.1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_GITHUB:=tatsuhiro-t/}
 EXTRACT_SUFX=	.tar.xz
@@ -12,8 +12,12 @@ HOMEPAGE=	https://nghttp2.org/
 COMMENT=	Implementation of HTTP/2 in C
 LICENSE=	mit
 
-USE_LANGUAGES=		c c++14
-GCC_REQD+=		6
+# Upstream documents that c++14 is required for C++ parts of the code;
+# the base package does not use C++.
+USE_LANGUAGES=		c
+# Upstream documents that gcc>=6 or clang >= 6 is required, but this
+# appears not to be true for the C parts.
+# https://github.com/nghttp2/nghttp2/issues/1293
 
 USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake pkg-config

Index: pkgsrc/www/nghttp2/options.mk
diff -u pkgsrc/www/nghttp2/options.mk:1.5 pkgsrc/www/nghttp2/options.mk:1.6
--- pkgsrc/www/nghttp2/options.mk:1.5	Thu Dec 21 08:18:38 2017
+++ pkgsrc/www/nghttp2/options.mk	Mon Jan 14 17:22:18 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2017/12/21 08:18:38 adam Exp $
+# $NetBSD: options.mk,v 1.6 2019/01/14 17:22:18 gdt Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.nghttp2
 PKG_SUPPORTED_OPTIONS=	nghttp2-asio nghttp2-tools
@@ -12,8 +12,9 @@ PLIST_VARS+=	asio tools
 ### Build the ASIO C++ library
 ###
 .if !empty(PKG_OPTIONS:Mnghttp2-asio)
-# Requires emplace() for associative containers, introduced in gcc 4.8.0
-GCC_REQD+=		4.8
+# Upstream documents C++14 and gcc>=6 or clang>=6
+USE_LANGUAGES+=		c++14
+GCC_REQD+=		6
 CONFIGURE_ARGS+=	--enable-asio-lib
 CONFIGURE_ARGS+=	--with-boost=${BUILDLINK_PREFIX.boost-libs}
 CONFIGURE_ARGS+=	--with-boost-asio
@@ -30,8 +31,9 @@ CONFIGURE_ARGS+=	--with-boost=no
 ### Build apps and tools
 ###
 .if !empty(PKG_OPTIONS:Mnghttp2-tools)
-# Requires emplace() for associative containers, introduced in gcc 4.8.0
-GCC_REQD+=		4.8
+# Upstream documents C++14 and gcc>=6 or clang>=6
+USE_LANGUAGES+=		c++14
+GCC_REQD+=		6
 CONFIGURE_ARGS+=	--enable-app
 CONFIGURE_ARGS+=	--enable-hpack-tools
 PLIST.tools=		yes


--_----------=_1547486539288230--