[packages/nodejs-gyp] add system gyp support via --gyp=/usr/bin/gyp
glen
glen at pld-linux.org
Sun Apr 7 22:19:17 CEST 2013
commit 61b1530d98a08592e2e71123fd6b43ae63c98e56
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Sun Apr 7 23:18:52 2013 +0300
add system gyp support via --gyp=/usr/bin/gyp
nodejs-gyp.spec | 13 +++++--------
system-gyp.patch | 21 +++++++++++++++++++++
2 files changed, 26 insertions(+), 8 deletions(-)
---
diff --git a/nodejs-gyp.spec b/nodejs-gyp.spec
index 2088132..29f5fcc 100644
--- a/nodejs-gyp.spec
+++ b/nodejs-gyp.spec
@@ -1,18 +1,17 @@
-# TODO
-# - use system gyp
-
%define pkg node-gyp
Summary: Node.js native addon build tool
Name: nodejs-gyp
Version: 0.9.5
-Release: 0.2
+Release: 0.3
License: MIT
Group: Development/Libraries
URL: https://github.com/TooTallNate/node-gyp
Source0: http://registry.npmjs.org/node-gyp/-/node-gyp-%{version}.tgz
# Source0-md5: 3d8a5cf4b5b92457af68035bb0e0e96f
Patch0: jobs-alias.patch
+Patch1: system-gyp.patch
BuildRequires: sed >= 4.0
+Requires: gyp
Requires: make
Requires: nodejs
Requires: nodejs-devel
@@ -51,6 +50,7 @@ replacement to the node-waf program which is removed for node v0.8.
%setup -qc
mv package/* .
%patch0 -p1
+%patch1 -p1
# fix shebangs
%{__sed} -i -e '1s,^#!.*node,#!/usr/bin/node,' \
@@ -61,7 +61,7 @@ rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{nodejs_libdir}/%{pkg}
cp -pr bin lib legacy package.json $RPM_BUILD_ROOT%{nodejs_libdir}/%{pkg}
-cp -pr *.gyp* gyp $RPM_BUILD_ROOT%{nodejs_libdir}/%{pkg}
+cp -pr *.gyp* $RPM_BUILD_ROOT%{nodejs_libdir}/%{pkg}
install -d $RPM_BUILD_ROOT%{_bindir}
ln -s %{nodejs_libdir}/%{pkg}/bin/node-gyp.js $RPM_BUILD_ROOT%{_bindir}/node-gyp
@@ -82,6 +82,3 @@ rm -rf $RPM_BUILD_ROOT
# waf based tools
%{nodejs_libdir}/%{pkg}/legacy
-
-%defattr(-,root,root,-)
-%{nodejs_libdir}/%{pkg}/gyp
diff --git a/system-gyp.patch b/system-gyp.patch
new file mode 100644
index 0000000..2af4809
--- /dev/null
+++ b/system-gyp.patch
@@ -0,0 +1,21 @@
+--- nodejs-gyp-0.9.5/lib/configure.js 2013-03-09 03:34:37.000000000 +0200
++++ ./lib/configure.js 2013-04-07 22:52:41.689964923 +0300
+@@ -373,7 +373,7 @@
+ })
+
+ // this logic ported from the old `gyp_addon` python file
+- var gyp_script = path.resolve(__dirname, '..', 'gyp', 'gyp')
++ var gyp_script = gyp.opts.gyp || path.resolve(__dirname, '..', 'gyp', 'gyp')
+ var addon_gypi = path.resolve(__dirname, '..', 'addon.gypi')
+ var common_gypi = path.resolve(nodeDir, 'common.gypi')
+ var output_dir = 'build'
+--- nodejs-gyp-0.9.5/lib/node-gyp.js 2013-03-09 01:42:19.000000000 +0200
++++ ./lib/node-gyp.js 2013-04-07 22:54:31.155021983 +0300
+@@ -84,6 +84,7 @@
+ , nodedir: String // 'configure'
+ , loglevel: String // everywhere
+ , python: String // 'configure'
++ , gyp: String // 'configure'
+ , 'dist-url': String // 'install'
+ , jobs: String // 'build'
+ , thin: String // 'configure'
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/nodejs-gyp.git/commitdiff/61b1530d98a08592e2e71123fd6b43ae63c98e56
More information about the pld-cvs-commit
mailing list