From: "Jeroen Roovers" <jer@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/nodejs/files/
Date: Wed, 1 Nov 2017 11:42:09 +0000 (UTC) [thread overview]
Message-ID: <1509536527.6f2fbe4cdc8784a5317a7c1ca6f66a51e79bb232.jer@gentoo> (raw)
commit: 6f2fbe4cdc8784a5317a7c1ca6f66a51e79bb232
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 1 11:41:46 2017 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> 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'
next reply other threads:[~2017-11-01 11:42 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-01 11:42 Jeroen Roovers [this message]
-- strict thread matches above, loose matches on Subject: below --
2017-11-21 12:01 [gentoo-commits] repo/gentoo:master commit in: net-libs/nodejs/files/ Jeroen Roovers
2018-01-04 12:31 Jeroen Roovers
2018-12-13 12:44 Jeroen Roovers
2020-02-23 19:54 Magnus Granberg
2021-05-16 18:17 Marek Szuba
2021-05-16 18:17 Marek Szuba
2022-05-06 5:21 Joonas Niilola
2022-05-13 20:04 Sam James
2022-05-30 3:58 Sam James
2022-06-05 23:03 Conrad Kostecki
2022-07-18 21:41 Conrad Kostecki
2022-07-19 17:10 Conrad Kostecki
2024-04-18 19:32 Conrad Kostecki
2024-05-30 14:55 Arthur Zamarin
2024-08-28 7:25 Joonas Niilola
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1509536527.6f2fbe4cdc8784a5317a7c1ca6f66a51e79bb232.jer@gentoo \
--to=jer@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox