diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
commit | 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch) | |
tree | ba5f07bf3f9d22d82e54a462313f5d244036c768 /net-libs/nodejs/files |
reinit the tree, so we can have metadata
Diffstat (limited to 'net-libs/nodejs/files')
-rw-r--r-- | net-libs/nodejs/files/gentoo-global-npm-config.patch | 40 | ||||
-rw-r--r-- | net-libs/nodejs/files/nodejs-8.4.0-shared-nghttp2.patch | 105 |
2 files changed, 145 insertions, 0 deletions
diff --git a/net-libs/nodejs/files/gentoo-global-npm-config.patch b/net-libs/nodejs/files/gentoo-global-npm-config.patch new file mode 100644 index 000000000000..e7346b826852 --- /dev/null +++ b/net-libs/nodejs/files/gentoo-global-npm-config.patch @@ -0,0 +1,40 @@ +commit 46ac7cd4229eac5e0182ab62b7ed844c24a8c52e +Author: Johan Bergström <bugs@bergstroem.nu> +Date: Wed Feb 10 22:45:59 2016 +1100 + + npm: set global config folder to /etc/npm + + npm previously assumed that the global config path would be + based on $prefix/etc. Since gentoo installs nodejs into /usr, + this means we're also creating /usr/etc which is less desirable. + + This patch will likely never go upstream. + +diff --git a/deps/npm/lib/config/core.js b/deps/npm/lib/config/core.js +index d1306eb..bd2ef89 100644 +--- a/deps/npm/lib/config/core.js ++++ b/deps/npm/lib/config/core.js +@@ -150,16 +150,14 @@ function load_ (builtin, rc, cli, cb) { + // Eg, `npm config get globalconfig --prefix ~/local` should + // return `~/local/etc/npmrc` + // annoying humans and their expectations! +- if (conf.get('prefix')) { +- var etc = path.resolve(conf.get('prefix'), 'etc') +- mkdirp(etc, function () { +- defaults.globalconfig = path.resolve(etc, 'npmrc') +- defaults.globalignorefile = path.resolve(etc, 'npmignore') +- afterUserContinuation() +- }) +- } else { ++ ++ // gentoo deviates wrt global config; store in /etc/npm ++ var globalconfig = path.resolve('/etc', 'npm') ++ mkdirp(globalconfig, function () { ++ defaults.globalconfig = path.resolve(globalconfig, 'npmrc') ++ defaults.globalignorefile = path.resolve(globalconfig, 'npmignore') + afterUserContinuation() +- } ++ }) + } + + function afterUserContinuation () { 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 new file mode 100644 index 000000000000..1f1a2e6ea636 --- /dev/null +++ b/net-libs/nodejs/files/nodejs-8.4.0-shared-nghttp2.patch @@ -0,0 +1,105 @@ +--- 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' |