diff options
| author | bsiegert <bsiegert@pkgsrc.org> | 2019-01-19 21:09:42 +0000 |
|---|---|---|
| committer | bsiegert <bsiegert@pkgsrc.org> | 2019-01-19 21:09:42 +0000 |
| commit | 95c0d4e315add60dcd7874281f8228ae6229f4b0 (patch) | |
| tree | 8331cfce71e440b4c90e7ac6a3fa866fe394e2a7 | |
| parent | 7f360d8583ce01c3bc2324d328adcb97dcd06f16 (diff) | |
| download | pkgsrc-95c0d4e315add60dcd7874281f8228ae6229f4b0.tar.gz | |
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)
| -rw-r--r-- | www/nghttp2/Makefile | 12 | ||||
| -rw-r--r-- | www/nghttp2/options.mk | 12 |
2 files changed, 16 insertions, 8 deletions
diff --git a/www/nghttp2/Makefile b/www/nghttp2/Makefile index d958d4d16c9..dd951c8f248 100644 --- a/www/nghttp2/Makefile +++ b/www/nghttp2/Makefile @@ -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 diff --git a/www/nghttp2/options.mk b/www/nghttp2/options.mk index a96075e6068..19682034585 100644 --- a/www/nghttp2/options.mk +++ b/www/nghttp2/options.mk @@ -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 |