[packages/nodejs] callout install.py directly instead of patching makefile

glen glen at pld-linux.org
Sat Oct 17 21:02:56 CEST 2015


commit 39356b33d31b4ba5a812c020aa1d6360794aa387
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sat Oct 17 21:33:17 2015 +0300

    callout install.py directly instead of patching makefile

 nodejs-shared.patch | 19 -------------------
 nodejs.spec         |  4 +---
 2 files changed, 1 insertion(+), 22 deletions(-)
---
diff --git a/nodejs.spec b/nodejs.spec
index fd82da0..91f1c84 100644
--- a/nodejs.spec
+++ b/nodejs.spec
@@ -132,9 +132,7 @@ LDFLAGS="%{rpmldflags}" \
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__make} justinstall \
-	DESTDIR=$RPM_BUILD_ROOT \
-	LIBDIR=%{_lib}
+%{__python} tools/install.py install "$RPM_BUILD_ROOT" "%{_lib}"
 
 lib=$(basename $RPM_BUILD_ROOT%{_libdir}/libnode.so.*.*.*)
 ln -s $lib $RPM_BUILD_ROOT%{_libdir}/libnode.so.10
diff --git a/nodejs-shared.patch b/nodejs-shared.patch
index 81358e8..c22719e 100644
--- a/nodejs-shared.patch
+++ b/nodejs-shared.patch
@@ -1,22 +1,3 @@
---- node-v0.10.3-o/Makefile	2013-04-03 11:30:57.000000000 -0600
-+++ node-v0.10.3/Makefile	2013-04-03 19:30:22.000000000 -0600
-@@ -54,11 +54,13 @@
- config.gypi: configure
- 	$(PYTHON) ./configure
- 
--install: all
--	$(PYTHON) tools/install.py $@ $(DESTDIR)
-+install: all justinstall
-+
-+justinstall:
-+	$(PYTHON) tools/install.py install $(DESTDIR) $(LIBDIR)
- 
- uninstall:
--	$(PYTHON) tools/install.py $@ $(DESTDIR)
-+	$(PYTHON) tools/install.py $@ $(DESTDIR) $(LIBDIR)
- 
- clean:
- 	-rm -rf out/Makefile node node_g out/$(BUILDTYPE)/node blog.html email.md
 --- node-v0.10.3/common.gypi~	2013-04-03 20:30:57.000000000 +0300
 +++ node-v0.10.3/common.gypi	2013-04-08 15:50:00.327121152 +0300
 @@ -8,6 +8,8 @@
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/nodejs.git/commitdiff/9ea1462f83d3c91d6158cdf8347877912064a648



More information about the pld-cvs-commit mailing list