| 1 |
chutzpah 11/05/26 15:55:45 |
| 2 |
|
| 3 |
Modified: nspluginwrapper-1.4.0-parallel-make.patch |
| 4 |
Log: |
| 5 |
A new approach to the parallel make patch, it should be more reliable now. Thanks to Cardoe for the suggestion. |
| 6 |
|
| 7 |
(Portage version: 2.1.9.49/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.3 www-plugins/nspluginwrapper/files/nspluginwrapper-1.4.0-parallel-make.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/nspluginwrapper/files/nspluginwrapper-1.4.0-parallel-make.patch?rev=1.3&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/nspluginwrapper/files/nspluginwrapper-1.4.0-parallel-make.patch?rev=1.3&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/nspluginwrapper/files/nspluginwrapper-1.4.0-parallel-make.patch?r1=1.2&r2=1.3 |
| 15 |
|
| 16 |
Index: nspluginwrapper-1.4.0-parallel-make.patch |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/www-plugins/nspluginwrapper/files/nspluginwrapper-1.4.0-parallel-make.patch,v |
| 19 |
retrieving revision 1.2 |
| 20 |
retrieving revision 1.3 |
| 21 |
diff -u -r1.2 -r1.3 |
| 22 |
--- nspluginwrapper-1.4.0-parallel-make.patch 26 May 2011 15:19:28 -0000 1.2 |
| 23 |
+++ nspluginwrapper-1.4.0-parallel-make.patch 26 May 2011 15:55:45 -0000 1.3 |
| 24 |
@@ -1,52 +1,34 @@ |
| 25 |
diff -ur nspluginwrapper-1.4.0.orig//Makefile nspluginwrapper-1.4.0/Makefile |
| 26 |
---- nspluginwrapper-1.4.0.orig//Makefile 2011-05-15 15:35:06.000000000 -0400 |
| 27 |
-+++ nspluginwrapper-1.4.0/Makefile 2011-05-24 19:03:50.704343843 -0400 |
| 28 |
-@@ -242,25 +242,25 @@ |
| 29 |
- mkdir -p $(DESTDIR)$(nphostdir) || : |
| 30 |
- mkdir -p $(DESTDIR)$(nptargetdir) || : |
| 31 |
+--- nspluginwrapper-1.4.0.orig//Makefile 2011-05-26 11:32:55.694455398 -0400 |
| 32 |
++++ nspluginwrapper-1.4.0/Makefile 2011-05-26 11:43:31.955887009 -0400 |
| 33 |
+@@ -14,7 +14,7 @@ |
| 34 |
+ endif |
| 35 |
+ |
| 36 |
+ ifeq ($(INSTALL),) |
| 37 |
+-INSTALL = install |
| 38 |
++INSTALL = install -D |
| 39 |
+ ifneq (,$(findstring $(OS),solaris)) |
| 40 |
+ INSTALL = $(SRC_PATH)/utils/install.sh |
| 41 |
+ endif |
| 42 |
+@@ -236,11 +236,7 @@ |
| 43 |
+ uninstall.mkruntime: |
| 44 |
+ rm -f $(DESTDIR)$(npcommondir)/mkruntime |
| 45 |
+ |
| 46 |
+-install: install.dirs install.player install.wrapper install.viewer install.libnoxshm install.loader install.config |
| 47 |
+-install.dirs: |
| 48 |
+- mkdir -p $(DESTDIR)$(npcommondir) || : |
| 49 |
+- mkdir -p $(DESTDIR)$(nphostdir) || : |
| 50 |
+- mkdir -p $(DESTDIR)$(nptargetdir) || : |
| 51 |
++install: install.player install.wrapper install.viewer install.libnoxshm install.loader install.config |
| 52 |
ifeq ($(build_player),yes) |
| 53 |
--install.player: $(npplayer_PROGRAM) |
| 54 |
-+install.player: install.dirs $(npplayer_PROGRAM) |
| 55 |
+ install.player: $(npplayer_PROGRAM) |
| 56 |
$(INSTALL) -m 755 $(STRIP_OPT) $(npplayer_PROGRAM) $(DESTDIR)$(nphostdir)/$(npplayer_PROGRAM) |
| 57 |
- mkdir -p $(DESTDIR)$(bindir) |
| 58 |
- $(LN_S) $(nphostdir)/$(npplayer_PROGRAM) $(DESTDIR)$(bindir)/nspluginplayer |
| 59 |
- else |
| 60 |
- install.player: |
| 61 |
- endif |
| 62 |
--install.wrapper: $(npwrapper_LIBRARY) |
| 63 |
-+install.wrapper: install.dirs $(npwrapper_LIBRARY) |
| 64 |
- $(INSTALL) -m 755 $(STRIP_OPT) $(npwrapper_LIBRARY) $(DESTDIR)$(nphostdir)/$(npwrapper_LIBRARY) |
| 65 |
- ifeq ($(build_viewer),yes) |
| 66 |
--install.viewer: install.viewer.bin install.viewer.glue |
| 67 |
--install.libnoxshm: do.install.libnoxshm |
| 68 |
-+install.viewer: install.dirs install.viewer.bin install.viewer.glue |
| 69 |
-+install.libnoxshm: install.dirs do.install.libnoxshm |
| 70 |
- else |
| 71 |
- install.viewer: |
| 72 |
- install.libnoxshm: |
| 73 |
+@@ -260,7 +256,7 @@ |
| 74 |
endif |
| 75 |
--install.viewer.bin: $(npviewer_PROGRAM) |
| 76 |
-+install.viewer.bin: install.dirs $(npviewer_PROGRAM) |
| 77 |
+ install.viewer.bin: $(npviewer_PROGRAM) |
| 78 |
$(INSTALL) -m 755 $(STRIP_OPT) $(npviewer_PROGRAM) $(DESTDIR)$(nptargetdir)/$(npviewer_PROGRAM) |
| 79 |
-install.viewer.glue:: |
| 80 |
-+install.viewer.glue:: install.dirs |
| 81 |
++install.viewer.glue:: install.viewer.bin |
| 82 |
p=$(DESTDIR)$(nptargetdir)/$(npviewer_PROGRAM:%.bin=%); \ |
| 83 |
echo "#!/bin/sh" > $$p; \ |
| 84 |
echo "TARGET_OS=$(TARGET_OS)" >> $$p; \ |
| 85 |
-@@ -272,13 +272,13 @@ |
| 86 |
- echo "esac" >> $$p; \ |
| 87 |
- echo ". $(npcommondir)/$(nploader_PROGRAM)" >> $$p; \ |
| 88 |
- chmod 755 $$p |
| 89 |
--do.install.libnoxshm: $(libnoxshm_LIBRARY) |
| 90 |
-+do.install.libnoxshm: install.dirs $(libnoxshm_LIBRARY) |
| 91 |
- $(INSTALL) -m 755 $(STRIP_OPT) $(libnoxshm_LIBRARY) $(DESTDIR)$(nptargetdir)/$(libnoxshm_LIBRARY) |
| 92 |
--install.config: $(npconfig_PROGRAM) |
| 93 |
-+install.config: install.dirs $(npconfig_PROGRAM) |
| 94 |
- $(INSTALL) -m 755 $(STRIP_OPT) $(npconfig_PROGRAM) $(DESTDIR)$(nphostdir)/$(npconfig_PROGRAM) |
| 95 |
- mkdir -p $(DESTDIR)$(bindir) |
| 96 |
- $(LN_S) $(nphostdir)/$(npconfig_PROGRAM) $(DESTDIR)$(bindir)/nspluginwrapper |
| 97 |
--install.loader: $(nploader_PROGRAM) |
| 98 |
-+install.loader: install.dirs $(nploader_PROGRAM) |
| 99 |
- $(INSTALL) -m 755 $(nploader_PROGRAM) $(DESTDIR)$(npcommondir)/$(nploader_PROGRAM) |
| 100 |
- install.mkruntime: $(SRC_PATH)/utils/mkruntime.sh |
| 101 |
- $(INSTALL) -m 755 $< $(DESTDIR)$(npcommondir)/mkruntime |
Archives