From 3a54e91338923da84afe0575cb133c1dd9dc8d14 Mon Sep 17 00:00:00 2001 From: "T.C. Hollingsworth" Date: Tue, 28 May 2013 20:12:55 -0700 Subject: [PATCH] patch Makefile so we can just remove all bundled deps completely --- nodejs-disable-gyp-deps.patch | 11 +++++++++++ nodejs.spec | 27 ++++++--------------------- 2 files changed, 17 insertions(+), 21 deletions(-) create mode 100644 nodejs-disable-gyp-deps.patch 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 e1a2a9a..fd757dc 100644 --- a/nodejs.spec +++ b/nodejs.spec @@ -23,6 +23,9 @@ Source5: nodejs-symlink-deps Source6: nodejs-fixdep Source7: nodejs_native.attr +# 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 @@ -79,28 +82,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) @@ -193,6 +177,7 @@ cp -p common.gypi %{buildroot}%{_datadir}/node * Wed May 29 2013 T.C. Hollingsworth - 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 * Wed May 15 2013 T.C. Hollingsworth - 0.10.6-1 - new upstream release 0.10.6