[nodejs/el6] patch Makefile so we can just remove all bundled deps completely (cherry picked from commit 3a54e913
T.C. Hollingsworth
patches at fedoraproject.org
Wed May 29 03:20:57 UTC 2013
commit 61f39f6d644ec6905be507400eeab064d244e4d4
Author: T.C. Hollingsworth <tchollingsworth at gmail.com>
Date: Tue May 28 20:12:55 2013 -0700
patch Makefile so we can just remove all bundled deps completely
(cherry picked from commit 3a54e91338923da84afe0575cb133c1dd9dc8d14)
nodejs-disable-gyp-deps.patch | 11 +++++++++++
nodejs.spec | 27 ++++++---------------------
2 files changed, 17 insertions(+), 21 deletions(-)
---
diff --git a/nodejs-disable-gyp-deps.patch b/nodejs-disable-gyp-deps.patch
new file mode 100644
index 0000000..5be37d6
--- /dev/null
+++ b/nodejs-disable-gyp-deps.patch
@@ -0,0 +1,11 @@
+--- Makefile~ 2013-05-17 13:59:10.000000000 -0700
++++ Makefile 2013-05-28 20:09:57.199250068 -0700
+@@ -43,7 +43,7 @@
+ ln -fs out/Debug/node $@
+ endif
+
+-out/Makefile: common.gypi deps/uv/uv.gyp deps/http_parser/http_parser.gyp deps/zlib/zlib.gyp deps/v8/build/common.gypi deps/v8/tools/gyp/v8.gyp node.gyp config.gypi
++out/Makefile: common.gypi node.gyp config.gypi
+ ifeq ($(USE_NINJA),1)
+ touch out/Makefile
+ $(PYTHON) tools/gyp_node -f ninja
diff --git a/nodejs.spec b/nodejs.spec
index d075aab..32a1aba 100644
--- a/nodejs.spec
+++ b/nodejs.spec
@@ -21,6 +21,9 @@ Source4: nodejs.req
Source5: nodejs-symlink-deps
Source6: nodejs-fixdep
+# Disable running gyp on bundled deps we don't use
+Patch1: nodejs-disable-gyp-deps.patch
+
# V8 presently breaks ABI at least every x.y release while never bumping SONAME,
# so we need to be more explicit until spot fixes that
%global v8_ge 1:3.14.5.7
@@ -80,28 +83,9 @@ The API documentation for the Node.js JavaScript runtime.
%prep
%setup -q -n node-v%{version}
+%patch1 -p0
-# Make sure nothing gets included from bundled deps:
-# We only delete the source and header files, because
-# the remaining build scripts are still used.
-
-find deps/cares -name "*.c" -exec rm -f {} \;
-find deps/cares -name "*.h" -exec rm -f {} \;
-
-find deps/npm -name "*.c" -exec rm -f {} \;
-find deps/npm -name "*.h" -exec rm -f {} \;
-
-find deps/zlib -name "*.c" -exec rm -f {} \;
-find deps/zlib -name "*.h" -exec rm -f {} \;
-
-find deps/v8 -name "*.c" -exec rm -f {} \;
-find deps/v8 -name "*.h" -exec rm -f {} \;
-
-find deps/http_parser -name "*.c" -exec rm -f {} \;
-find deps/http_parser -name "*.h" -exec rm -f {} \;
-
-find deps/uv -name "*.c" -exec rm -f {} \;
-find deps/uv -name "*.h" -exec rm -f {} \;
+rm -rf deps
%build
# build with debugging symbols and add defines from libuv (#892601)
@@ -191,6 +175,7 @@ cp -p common.gypi %{buildroot}%{_datadir}/node
* Wed May 29 2013 T.C. Hollingsworth <tchollingsworth at gmail.com> - 0.10.7-1
- new upstream release 0.10.7
- strip openssl from the tarball; it contains prohibited code (RHBZ#967736)
+- patch Makefile so we can just remove all bundled deps completely
* Mon May 06 2013 T.C. Hollingsworth <tchollingsworth at gmail.com> - 0.10.5-3
- nodejs-fixdep: work properly when a package has no dependencies
More information about the scm-commits
mailing list