Sat Jan 19 21:09:42 2019 UTC ()
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)


(bsiegert)
diff -r1.46 -r1.46.2.1 pkgsrc/www/nghttp2/Makefile
diff -r1.5 -r1.5.10.1 pkgsrc/www/nghttp2/options.mk
cvs diff -r1.46 -r1.46.2.1 pkgsrc/www/nghttp2/Makefile (expand / switch to unified diff)

--- pkgsrc/www/nghttp2/Makefile 2018/12/13 19:51:38 1.46
+++ pkgsrc/www/nghttp2/Makefile 2019/01/19 21:09:42 1.46.2.1
@@ -1,28 +1,34 @@ @@ -1,28 +1,34 @@
1# $NetBSD: Makefile,v 1.46 2018/12/13 19:51:38 adam Exp $ 1# $NetBSD: Makefile,v 1.46.2.1 2019/01/19 21:09:42 bsiegert Exp $
2 2
3DISTNAME= nghttp2-1.35.1 3DISTNAME= nghttp2-1.35.1
4PKGREVISION= 1 4PKGREVISION= 2
5CATEGORIES= www 5CATEGORIES= www
6MASTER_SITES= ${MASTER_SITE_GITHUB:=tatsuhiro-t/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=tatsuhiro-t/}
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8GITHUB_RELEASE= v${PKGVERSION_NOREV} 8GITHUB_RELEASE= v${PKGVERSION_NOREV}
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= https://nghttp2.org/ 11HOMEPAGE= https://nghttp2.org/
12COMMENT= Implementation of HTTP/2 in C 12COMMENT= Implementation of HTTP/2 in C
13LICENSE= mit 13LICENSE= mit
14 14
15USE_LANGUAGES= c c++14 15# Upstream documents that c++14 is required for C++ parts of the code;
 16# the base package does not use C++.
 17USE_LANGUAGES= c
 18# Upstream documents that gcc>=6 or clang >= 6 is required, but this
 19# appears not to be true for the C parts.
 20# https://github.com/nghttp2/nghttp2/issues/1293
 21
16USE_LIBTOOL= yes 22USE_LIBTOOL= yes
17USE_TOOLS+= gmake pkg-config 23USE_TOOLS+= gmake pkg-config
18GNU_CONFIGURE= yes 24GNU_CONFIGURE= yes
19CONFIGURE_ARGS+= --disable-examples 25CONFIGURE_ARGS+= --disable-examples
20CONFIGURE_ARGS+= --disable-python-bindings 26CONFIGURE_ARGS+= --disable-python-bindings
21PKGCONFIG_OVERRIDE+= lib/libnghttp2.pc.in 27PKGCONFIG_OVERRIDE+= lib/libnghttp2.pc.in
22PKGCONFIG_OVERRIDE+= src/libnghttp2_asio.pc.in 28PKGCONFIG_OVERRIDE+= src/libnghttp2_asio.pc.in
23 29
24REPLACE_PYTHON+= script/fetch-ocsp-response 30REPLACE_PYTHON+= script/fetch-ocsp-response
25 31
26.include "options.mk" 32.include "options.mk"
27 33
28.include "../../lang/python/application.mk" 34.include "../../lang/python/application.mk"
cvs diff -r1.5 -r1.5.10.1 pkgsrc/www/nghttp2/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/www/nghttp2/Attic/options.mk 2017/12/21 08:18:38 1.5
+++ pkgsrc/www/nghttp2/Attic/options.mk 2019/01/19 21:09:42 1.5.10.1
@@ -1,46 +1,48 @@ @@ -1,46 +1,48 @@
1# $NetBSD: options.mk,v 1.5 2017/12/21 08:18:38 adam Exp $ 1# $NetBSD: options.mk,v 1.5.10.1 2019/01/19 21:09:42 bsiegert Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.nghttp2 3PKG_OPTIONS_VAR= PKG_OPTIONS.nghttp2
4PKG_SUPPORTED_OPTIONS= nghttp2-asio nghttp2-tools 4PKG_SUPPORTED_OPTIONS= nghttp2-asio nghttp2-tools
5PKG_SUGGESTED_OPTIONS= # 5PKG_SUGGESTED_OPTIONS= #
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9PLIST_VARS+= asio tools 9PLIST_VARS+= asio tools
10 10
11### 11###
12### Build the ASIO C++ library 12### Build the ASIO C++ library
13### 13###
14.if !empty(PKG_OPTIONS:Mnghttp2-asio) 14.if !empty(PKG_OPTIONS:Mnghttp2-asio)
15# Requires emplace() for associative containers, introduced in gcc 4.8.0 15# Upstream documents C++14 and gcc>=6 or clang>=6
16GCC_REQD+= 4.8 16USE_LANGUAGES+= c++14
 17GCC_REQD+= 6
17CONFIGURE_ARGS+= --enable-asio-lib 18CONFIGURE_ARGS+= --enable-asio-lib
18CONFIGURE_ARGS+= --with-boost=${BUILDLINK_PREFIX.boost-libs} 19CONFIGURE_ARGS+= --with-boost=${BUILDLINK_PREFIX.boost-libs}
19CONFIGURE_ARGS+= --with-boost-asio 20CONFIGURE_ARGS+= --with-boost-asio
20CONFIGURE_ARGS+= --with-boost-system 21CONFIGURE_ARGS+= --with-boost-system
21CONFIGURE_ARGS+= --with-boost-thread 22CONFIGURE_ARGS+= --with-boost-thread
22PLIST.asio= yes 23PLIST.asio= yes
23.include "../../devel/boost-libs/buildlink3.mk" 24.include "../../devel/boost-libs/buildlink3.mk"
24.include "../../security/openssl/buildlink3.mk" 25.include "../../security/openssl/buildlink3.mk"
25.else 26.else
26CONFIGURE_ARGS+= --with-boost=no 27CONFIGURE_ARGS+= --with-boost=no
27.endif 28.endif
28 29
29### 30###
30### Build apps and tools 31### Build apps and tools
31### 32###
32.if !empty(PKG_OPTIONS:Mnghttp2-tools) 33.if !empty(PKG_OPTIONS:Mnghttp2-tools)
33# Requires emplace() for associative containers, introduced in gcc 4.8.0 34# Upstream documents C++14 and gcc>=6 or clang>=6
34GCC_REQD+= 4.8 35USE_LANGUAGES+= c++14
 36GCC_REQD+= 6
35CONFIGURE_ARGS+= --enable-app 37CONFIGURE_ARGS+= --enable-app
36CONFIGURE_ARGS+= --enable-hpack-tools 38CONFIGURE_ARGS+= --enable-hpack-tools
37PLIST.tools= yes 39PLIST.tools= yes
38.include "../../devel/libev/buildlink3.mk" 40.include "../../devel/libev/buildlink3.mk"
39.include "../../devel/zlib/buildlink3.mk" 41.include "../../devel/zlib/buildlink3.mk"
40.include "../../net/libcares/buildlink3.mk" 42.include "../../net/libcares/buildlink3.mk"
41.include "../../security/openssl/buildlink3.mk" 43.include "../../security/openssl/buildlink3.mk"
42.include "../../textproc/jansson/buildlink3.mk" 44.include "../../textproc/jansson/buildlink3.mk"
43.else 45.else
44CONFIGURE_ARGS+= --disable-app 46CONFIGURE_ARGS+= --disable-app
45CONFIGURE_ARGS+= --disable-hpack-tools 47CONFIGURE_ARGS+= --disable-hpack-tools
46.endif 48.endif