From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4C3701396D9 for ; Wed, 1 Nov 2017 11:42:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6D756E0D43; Wed, 1 Nov 2017 11:42:12 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3DD62E0D43 for ; Wed, 1 Nov 2017 11:42:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D8EA6341723 for ; Wed, 1 Nov 2017 11:42:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 295959114 for ; Wed, 1 Nov 2017 11:42:09 +0000 (UTC) From: "Jeroen Roovers" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" Message-ID: <1509536527.6f2fbe4cdc8784a5317a7c1ca6f66a51e79bb232.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/nodejs/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/nodejs/files/nodejs-8.4.0-shared-nghttp2.patch X-VCS-Directories: net-libs/nodejs/files/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: 6f2fbe4cdc8784a5317a7c1ca6f66a51e79bb232 X-VCS-Branch: master Date: Wed, 1 Nov 2017 11:42:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b1bd0e8b-e167-4035-b766-e897774facb3 X-Archives-Hash: c785242da838fb5a97d8a563b1e71030 commit: 6f2fbe4cdc8784a5317a7c1ca6f66a51e79bb232 Author: Jeroen Roovers gentoo org> AuthorDate: Wed Nov 1 11:41:46 2017 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Wed Nov 1 11:42:07 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f2fbe4c net-libs/nodejs: Drop obsolete patch. Package-Manager: Portage-2.3.13, Repoman-2.3.4 .../nodejs/files/nodejs-8.4.0-shared-nghttp2.patch | 105 --------------------- 1 file changed, 105 deletions(-) diff --git a/net-libs/nodejs/files/nodejs-8.4.0-shared-nghttp2.patch b/net-libs/nodejs/files/nodejs-8.4.0-shared-nghttp2.patch deleted file mode 100644 index 1f1a2e6ea63..00000000000 --- a/net-libs/nodejs/files/nodejs-8.4.0-shared-nghttp2.patch +++ /dev/null @@ -1,105 +0,0 @@ ---- a/configure -+++ b/configure -@@ -182,6 +182,27 @@ - dest='shared_http_parser_libpath', - help='a directory to search for the shared http_parser DLL') - -+shared_optgroup.add_option('--shared-nghttp2', -+ action='store_true', -+ dest='shared_nghttp2', -+ help='link to a shared nghttp2 DLL instead of static linking') -+ -+shared_optgroup.add_option('--shared-nghttp2-includes', -+ action='store', -+ dest='shared_nghttp2_includes', -+ help='directory containing nghttp2 header files') -+ -+shared_optgroup.add_option('--shared-nghttp2-libname', -+ action='store', -+ dest='shared_nghttp2_libname', -+ default='nghttp2', -+ help='alternative lib name to link to [default: %default]') -+ -+shared_optgroup.add_option('--shared-nghttp2-libpath', -+ action='store', -+ dest='shared_nghttp2_libpath', -+ help='a directory to search for the shared nghttp2 DLL') -+ - shared_optgroup.add_option('--shared-libuv', - action='store_true', - dest='shared_libuv', -@@ -1381,6 +1381,7 @@ - configure_node(output) - configure_library('zlib', output) - configure_library('http_parser', output) -+configure_library('nghttp2', output) - configure_library('libuv', output) - configure_library('libcares', output) - # stay backwards compatible with shared cares builds ---- a/node.gyp -+++ b/node.gyp -@@ -14,6 +14,7 @@ - 'node_module_version%': '', - 'node_shared_zlib%': 'false', - 'node_shared_http_parser%': 'false', -+ 'node_shared_nghttp2%': 'false', - 'node_shared_cares%': 'false', - 'node_shared_libuv%': 'false', - 'node_use_openssl%': 'true', -@@ -149,10 +150,17 @@ - 'type': '<(node_target_type)', - - 'dependencies': [ -- 'node_js2c#host', -- 'deps/nghttp2/nghttp2.gyp:nghttp2' -+ 'node_js2c#host' - ], - -+ 'conditions': [ -+ [ 'node_shared_nghttp2=="false"', { -+ 'dependencies': [ -+ 'deps/nghttp2/nghttp2.gyp:nghttp2' -+ ] -+ }] -+ ], -+ - 'includes': [ - 'node.gypi' - ], -@@ -161,8 +161,7 @@ - 'src', - 'tools/msvs/genfiles', - 'deps/uv/src/ares', -- '<(SHARED_INTERMEDIATE_DIR)', # for node_natives.h -- 'deps/nghttp2/lib/includes' -+ '<(SHARED_INTERMEDIATE_DIR)' # for node_natives.h - ], - - 'sources': [ -@@ -275,9 +274,7 @@ - 'NODE_PLATFORM="<(OS)"', - 'NODE_WANT_INTERNALS=1', - # Warn when using deprecated V8 APIs. -- 'V8_DEPRECATION_WARNINGS=1', -- # We're using the nghttp2 static lib -- 'NGHTTP2_STATICLIB' -+ 'V8_DEPRECATION_WARNINGS=1' - ], - }, - { -@@ -687,6 +684,15 @@ - 'deps/http_parser/http_parser.gyp:http_parser' - ] - }], -+ [ 'node_shared_nghttp2=="false"', { -+ 'dependencies': [ -+ 'deps/nghttp2/nghttp2.gyp:nghttp2' -+ ], -+ 'defines': [ -+ # We're using the nghttp2 static lib -+ 'NGHTTP2_STATICLIB' -+ ] -+ }], - [ 'node_shared_libuv=="false"', { - 'dependencies': [ - 'deps/uv/uv.gyp:libuv'