diff options
| author | gdt <gdt@pkgsrc.org> | 2019-01-14 17:22:18 +0000 |
|---|---|---|
| committer | gdt <gdt@pkgsrc.org> | 2019-01-14 17:22:18 +0000 |
| commit | 6418d3f7171756bdcf7da47d98c5a5174a2340b5 (patch) | |
| tree | eda85b41bb716f085d8eb1f7e0393bf9fe6f8dee /www/nghttp2 | |
| parent | 820b8f64af051fa27eba4d96af3f82d914cc0470 (diff) | |
| download | pkgsrc-6418d3f7171756bdcf7da47d98c5a5174a2340b5.tar.gz | |
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.
Diffstat (limited to 'www/nghttp2')
| -rw-r--r-- | www/nghttp2/Makefile | 12 | ||||
| -rw-r--r-- | www/nghttp2/options.mk | 12 |
2 files changed, 15 insertions, 9 deletions
diff --git a/www/nghttp2/Makefile b/www/nghttp2/Makefile index 4c8c7c96310..78833a7fb9a 100644 --- a/www/nghttp2/Makefile +++ b/www/nghttp2/Makefile @@ -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 diff --git a/www/nghttp2/options.mk b/www/nghttp2/options.mk index a96075e6068..7ec051b9046 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.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 |