From 7d7cdd4ee41204e2940b57426c8fcda291ad4a94 Mon Sep 17 00:00:00 2001 From: Rasmus Thomsen Date: Tue, 8 Jan 2019 14:25:12 +0100 Subject: [PATCH] nodejs: update to 11.6.0. --- srcpkgs/nodejs/template | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template index 6f50825bd08..0780925daf0 100644 --- a/srcpkgs/nodejs/template +++ b/srcpkgs/nodejs/template @@ -1,28 +1,28 @@ # Template file for 'nodejs' pkgname=nodejs -version=10.15.0 -revision=2 +version=11.6.0 +revision=1 wrksrc="node-v${version}" # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079 hostmakedepends="pkg-config python zlib-devel $(vopt_if icu icu-devel) $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel) $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel) - $(vopt_if cares c-ares-devel)" + $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)" makedepends="zlib-devel python-devel $(vopt_if icu icu-devel) $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel) $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel) - $(vopt_if cares c-ares-devel)" + $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)" short_desc="Evented I/O for V8 javascript" maintainer="Enno Boland " license="MIT" homepage="https://nodejs.org/" distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz" -checksum=dbe467e3dabb6854fcb0cd96e04082268cb1e313ce97a4b7100b2ed152b0a0ab +checksum=39ef4f1866f75786baff5959439483fafdc99d3ee3a0568a13cc635d64cf5e0b build_options="ssl libuv http_parser icu nghttp2 cares" desc_option_ssl="Enable shared libressl" desc_option_libuv="Enable shared libuv" -desc_option_http_parser="Enable shared http-parser" +desc_option_http_parser="Enable shared http-parser and llhttp" desc_option_icu="Enable shared icu" desc_option_nghttp2="Enable shared nghttp2" desc_option_cares="Enable shared c-ares" @@ -61,6 +61,14 @@ do_configure() { $(vopt_if nghttp2 --shared-nghttp2) \ $(vopt_if cares --shared-cares) ${_args} } + +post_configure() { + # Fix linking against llhttp + sed 's/http_parser/& -lllhttp/' \ + -i out/cctest.target.mk \ + -i out/node.target.mk +} + do_build() { if [ "$CROSS_BUILD" ]; then make LD="$CXX" LDFLAGS+=-ldl ${makejobs} PORTABLE=1 V=1