CVS commit: [pkgsrc-2018Q4] pkgsrc/www/nghttp2

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Sat Jan 19 21:09:42 UTC 2019

Modified Files:
        pkgsrc/www/nghttp2 [pkgsrc-2018Q4]: Makefile options.mk

Log Message:
Pullup ticket #5892 - requested by gdt
www/nghttp2: build fix (don't require C++14 for the C library)

Revisions pulled up:
- www/nghttp2/Makefile          (patch)
- www/nghttp2/options.mk        (patch)


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.46.2.1 pkgsrc/www/nghttp2/Makefile
cvs rdiff -u -r1.5 -r1.5.10.1 pkgsrc/www/nghttp2/options.mk

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

Modified files:

Index: pkgsrc/www/nghttp2/Makefile
diff -u pkgsrc/www/nghttp2/Makefile:1.46 pkgsrc/www/nghttp2/Makefile:1.46.2.1
--- pkgsrc/www/nghttp2/Makefile:1.46    Thu Dec 13 19:51:38 2018
+++ pkgsrc/www/nghttp2/Makefile Sat Jan 19 21:09:42 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.46 2018/12/13 19:51:38 adam Exp $
+# $NetBSD: Makefile,v 1.46.2.1 2019/01/19 21:09:42 bsiegert Exp $
 
 DISTNAME=      nghttp2-1.35.1
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    www
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=tatsuhiro-t/}
 EXTRACT_SUFX=  .tar.xz
@@ -12,7 +12,13 @@ HOMEPAGE=    https://nghttp2.org/
 COMMENT=       Implementation of HTTP/2 in C
 LICENSE=       mit
 
-USE_LANGUAGES=         c c++14
+# 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
 GNU_CONFIGURE=         yes

Index: pkgsrc/www/nghttp2/options.mk
diff -u pkgsrc/www/nghttp2/options.mk:1.5 pkgsrc/www/nghttp2/options.mk:1.5.10.1
--- pkgsrc/www/nghttp2/options.mk:1.5   Thu Dec 21 08:18:38 2017
+++ pkgsrc/www/nghttp2/options.mk       Sat Jan 19 21:09:42 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2017/12/21 08:18:38 adam Exp $
+# $NetBSD: options.mk,v 1.5.10.1 2019/01/19 21:09:42 bsiegert 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