From 63536954aee284d62e6122f86298de3ee61f8d31 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Dec 16 2015 15:44:44 +0000 Subject: import nodejs010-node-gyp-3.2.0-2.el7 --- diff --git a/.gitignore b/.gitignore index b8f3b99..b62cb21 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/node-gyp-1.0.2.tgz +SOURCES/node-gyp-3.2.0.tgz diff --git a/.nodejs010-node-gyp.metadata b/.nodejs010-node-gyp.metadata index 4a21788..467d46f 100644 --- a/.nodejs010-node-gyp.metadata +++ b/.nodejs010-node-gyp.metadata @@ -1 +1 @@ -b0bb6d2d762271408dd904853e7aa3000ed2eb57 SOURCES/node-gyp-1.0.2.tgz +ed0bff7223d5607f1c3f7309ed4b7b99977e6d05 SOURCES/node-gyp-3.2.0.tgz diff --git a/SOURCES/node-gyp-addon-gypi.patch b/SOURCES/node-gyp-addon-gypi.patch index 622f5e8..c91625a 100644 --- a/SOURCES/node-gyp-addon-gypi.patch +++ b/SOURCES/node-gyp-addon-gypi.patch @@ -1,80 +1,60 @@ -From 6de79d3d2b661b25b99d4deb9c5792ee626b835d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hr=C4=8Dka?= -Date: Thu, 29 Jan 2015 15:26:54 +0100 +From 811861483808bdf55bcf1aaf465e166cff7d23b2 Mon Sep 17 00:00:00 2001 +From: Tomas Hrcka +Date: Mon, 30 Nov 2015 10:29:52 +0100 + Subject: [PATCH] use custom addon.gypi by default instead of downloading node back port of original patch http://pkgs.fedoraproject.org/cgit/node-gyp.git/tree/node-gyp-addon-gypi.patch --- - lib/configure.js | 46 +++++++++++++++++++++++----------------------- - 1 file changed, 23 insertions(+), 23 deletions(-) + lib/configure.js | 24 +++++++++++++++++++++++- + 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/lib/configure.js b/lib/configure.js -index 6f4fd40..1a003c4 100644 +index a446943..13eb9d3 100644 --- a/lib/configure.js +++ b/lib/configure.js -@@ -131,30 +131,29 @@ function configure (gyp, argv, callback) { +@@ -59,9 +59,30 @@ function configure (gyp, argv, callback) { + if ('v' + release.version !== process.version) { // if --target was given, then determine a target version to compile for - versionStr = gyp.opts.target - log.verbose('get node dir', 'compiling against --target node version: %s', versionStr) -+ // make sure we have a valid version -+ try { -+ version = semver.parse(versionStr) -+ } catch (e) { -+ return callback(e) -+ } -+ if (!version) { -+ return callback(new Error('Invalid version number: ' + versionStr)) -+ } -+ // ensure that the target node version's dev files are installed -+ gyp.opts.ensure = true -+ gyp.commands.install([ versionStr ], function (err, version) { -+ if (err) return callback(err) -+ log.verbose('get node dir', 'target node version installed:', version) -+ nodeDir = path.resolve(gyp.devDir, version) -+ createBuildDir() -+ }) + log.verbose('get node dir', 'compiling against --target node version: %s', release.version) ++ // make sure we have a valid version ++ try { ++ version = semver.parse(release.version) ++ } catch (e) { ++ return callback(e) ++ } ++ if (!version) { ++ return callback(new Error('Invalid version number: ' + release.version)) ++ } ++ // ensure that the target node version's dev files are installed ++ gyp.opts.ensure = true ++ gyp.commands.install([ release.version ], function (err, version) { ++ if (err) return callback(err) ++ log.verbose('get node dir', 'target node version installed:', version) ++ nodeDir = path.resolve(gyp.devDir, version) ++ createBuildDir() ++ }) } else { -- // if no --target was specified then use the current host node version -- versionStr = process.version -- log.verbose('get node dir', 'no --target version specified, falling back to host node version: %s', versionStr) -+ // if no --target was specified then use RPM-installed headers -+ log.verbose('get node dir', 'no --target version specified, falling back to RPM installed headers') -+ nodeDir = '/opt/rh/nodejs010/root/usr/share/node' -+ createBuildDir() + // if no --target was specified then use the current host node version ++ // if no --target was specified then use RPM-installed headers + log.verbose('get node dir', 'no --target version specified, falling back to host node version: %s', release.version) ++ log.verbose('get node dir', 'no --target version specified, falling back to RPM installed headers') ++ nodeDir = '/opt/rh/nodejs010/root/usr/share/node' ++ createBuildDir() } -- -- // make sure we have a valid version -- try { -- version = semver.parse(versionStr) -- } catch (e) { -- return callback(e) -- } -- if (!version) { -- return callback(new Error('Invalid version number: ' + versionStr)) -- } -- -- // ensure that the target node version's dev files are installed -- gyp.opts.ensure = true -- gyp.commands.install([ versionStr ], function (err, version) { -- if (err) return callback(err) -- log.verbose('get node dir', 'target node version installed:', version) -- nodeDir = path.resolve(gyp.devDir, version) -- createBuildDir() -- }) - } - } -@@ -298,7 +297,8 @@ function configure (gyp, argv, callback) { + if (!release.semver) { +@@ -248,7 +269,8 @@ function configure (gyp, argv, callback) { // this logic ported from the old `gyp_addon` python file var gyp_script = '/opt/rh/v8314/root/usr/bin/gyp' - var addon_gypi = path.resolve(__dirname, '..', 'addon.gypi') + var addon_gypi_file = gyp.opts.target || gyp.opts.nodeDir ? 'addon.gypi' : 'addon-rpm.gypi' + var addon_gypi = path.resolve(__dirname, '..', addon_gypi_file) - var common_gypi = path.resolve(nodeDir, 'common.gypi') - var output_dir = 'build' - if (win) { + var common_gypi = path.resolve(nodeDir, 'include/node/common.gypi') + fs.stat(common_gypi, function (err, stat) { + if (err) -- -1.8.3.1 +2.5.0 diff --git a/SOURCES/node-gyp-use-system-gyp.patch b/SOURCES/node-gyp-use-system-gyp.patch index 57e8d0e..2101a4d 100644 --- a/SOURCES/node-gyp-use-system-gyp.patch +++ b/SOURCES/node-gyp-use-system-gyp.patch @@ -1,25 +1,26 @@ -From f38147792fde04e1b223216ca6283777eb2022ff Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hr=C4=8Dka?= -Date: Fri, 30 Jan 2015 08:56:50 +0100 -Subject: [PATCH] Use system gyp +From 98b7b50acf8aba204c25ca10672b0e318467e192 Mon Sep 17 00:00:00 2001 +From: Tomas Hrcka +Date: Mon, 30 Nov 2015 10:17:06 +0100 +Subject: [PATCH] ides --- lib/configure.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/configure.js b/lib/configure.js -index 68f26d6..6f4fd40 100644 +index 4e06529..a446943 100644 --- a/lib/configure.js +++ b/lib/configure.js -@@ -297,7 +297,7 @@ function configure (gyp, argv, callback) { - }) +@@ -247,7 +247,7 @@ function configure (gyp, argv, callback) { + } // this logic ported from the old `gyp_addon` python file - var gyp_script = path.resolve(__dirname, '..', 'gyp', 'gyp_main.py') + var gyp_script = '/opt/rh/v8314/root/usr/bin/gyp' var addon_gypi = path.resolve(__dirname, '..', 'addon.gypi') - var common_gypi = path.resolve(nodeDir, 'common.gypi') - var output_dir = 'build' + var common_gypi = path.resolve(nodeDir, 'include/node/common.gypi') + fs.stat(common_gypi, function (err, stat) { -- -1.8.3.1 +2.5.0 +>>>>>>> rhscl-2.1-nodejs010-rhel-6 diff --git a/SPECS/node-gyp.spec b/SPECS/node-gyp.spec index 0a6d020..e94ca91 100644 --- a/SPECS/node-gyp.spec +++ b/SPECS/node-gyp.spec @@ -4,8 +4,8 @@ %{?nodejs_find_provides_and_requires} Name: %{?scl_prefix}node-gyp -Version: 1.0.2 -Release: 3%{?dist} +Version: 3.2.0 +Release: 2%{?dist} Summary: Node.js native addon build tool License: MIT Group: System Environment/Libraries @@ -44,9 +44,8 @@ program which is removed for node v0.8. %patch2 -p1 %patch1 -p1 %nodejs_fixdep request 2.x -%nodejs_fixdep semver 2.x %nodejs_fixdep nopt 3.x -%nodejs_fixdep glob 4.x +%nodejs_fixdep minimatch 3.x %build #nothing to do @@ -73,6 +72,12 @@ rm -rf %{buildroot} %doc README.md LICENSE %changelog +* Mon Nov 30 2015 Tomas Hrcka - 3.2.0-2 +- New upstream release + +* Thu Jul 23 2015 Tomas Hrcka - 2.0.2-1 +- Rebase to latest upstream stable + * Thu Jan 29 2015 Tomas Hrcka - 1.0.2-3 - Fix dependencies versions of nopt and glob - Backport Patch1 to new sources @@ -91,10 +96,17 @@ rm -rf %{buildroot} - use proper path for gyp since its comming from v8 collection * Thu Jan 09 2014 Tomas Hrcka - 0.10.6-2.2 +<<<<<<< HEAD - require v8314-v8 * Thu Dec 05 2013 Tomas Hrcka - 0.10.6-2.1 - rebuilt with gyp from v8 scl +======= +- replace dependency on nodejs010-v8 with v8314-v8 + +* Thu Dec 05 2013 Tomas Hrcka - 0.10.6-2.1 +- rebuilt with gyp from v8 collection +>>>>>>> rhscl-2.1-nodejs010-rhel-6 * Tue Jul 30 2013 T.C. Hollingsworth - 0.10.6-2 - fix semver dep