diff options
| author |   Patrick McLean <chutzpah@gentoo.org> | 2011-05-26 15:55:45 +0000 |
|---|---|---|
| committer | Patrick McLean <chutzpah@gentoo.org> | 2011-05-26 15:55:45 +0000 |
| commit | 6923fe2f3bbffc79b3f1e87ed321e04c494264ef (patch) | |
| tree | 487f33d8b30d8841eec64b3e1dcab5fb358ffa5e /www-plugins/nspluginwrapper/files | |
| parent | x86 stable wrt bug #366131 (diff) | |
| download | gentoo-2-6923fe2f3bbffc79b3f1e87ed321e04c494264ef.tar.gz gentoo-2-6923fe2f3bbffc79b3f1e87ed321e04c494264ef.tar.bz2 gentoo-2-6923fe2f3bbffc79b3f1e87ed321e04c494264ef.zip | |
A new approach to the parallel make patch, it should be more reliable now. Thanks to Cardoe for the suggestion.
(Portage version: 2.1.9.49/cvs/Linux x86_64)
Diffstat (limited to 'www-plugins/nspluginwrapper/files')
| -rw-r--r-- | www-plugins/nspluginwrapper/files/nspluginwrapper-1.4.0-parallel-make.patch | 68 |
1 files changed, 25 insertions, 43 deletions
diff --git a/www-plugins/nspluginwrapper/files/nspluginwrapper-1.4.0-parallel-make.patch b/www-plugins/nspluginwrapper/files/nspluginwrapper-1.4.0-parallel-make.patch index 168923da17f6..dbd7d09f08e1 100644 --- a/www-plugins/nspluginwrapper/files/nspluginwrapper-1.4.0-parallel-make.patch +++ b/www-plugins/nspluginwrapper/files/nspluginwrapper-1.4.0-parallel-make.patch @@ -1,52 +1,34 @@ diff -ur nspluginwrapper-1.4.0.orig//Makefile nspluginwrapper-1.4.0/Makefile ---- nspluginwrapper-1.4.0.orig//Makefile 2011-05-15 15:35:06.000000000 -0400 -+++ nspluginwrapper-1.4.0/Makefile 2011-05-24 19:03:50.704343843 -0400 -@@ -242,25 +242,25 @@ - mkdir -p $(DESTDIR)$(nphostdir) || : - mkdir -p $(DESTDIR)$(nptargetdir) || : +--- nspluginwrapper-1.4.0.orig//Makefile 2011-05-26 11:32:55.694455398 -0400 ++++ nspluginwrapper-1.4.0/Makefile 2011-05-26 11:43:31.955887009 -0400 +@@ -14,7 +14,7 @@ + endif + + ifeq ($(INSTALL),) +-INSTALL = install ++INSTALL = install -D + ifneq (,$(findstring $(OS),solaris)) + INSTALL = $(SRC_PATH)/utils/install.sh + endif +@@ -236,11 +236,7 @@ + uninstall.mkruntime: + rm -f $(DESTDIR)$(npcommondir)/mkruntime + +-install: install.dirs install.player install.wrapper install.viewer install.libnoxshm install.loader install.config +-install.dirs: +- mkdir -p $(DESTDIR)$(npcommondir) || : +- mkdir -p $(DESTDIR)$(nphostdir) || : +- mkdir -p $(DESTDIR)$(nptargetdir) || : ++install: install.player install.wrapper install.viewer install.libnoxshm install.loader install.config ifeq ($(build_player),yes) --install.player: $(npplayer_PROGRAM) -+install.player: install.dirs $(npplayer_PROGRAM) + install.player: $(npplayer_PROGRAM) $(INSTALL) -m 755 $(STRIP_OPT) $(npplayer_PROGRAM) $(DESTDIR)$(nphostdir)/$(npplayer_PROGRAM) - mkdir -p $(DESTDIR)$(bindir) - $(LN_S) $(nphostdir)/$(npplayer_PROGRAM) $(DESTDIR)$(bindir)/nspluginplayer - else - install.player: - endif --install.wrapper: $(npwrapper_LIBRARY) -+install.wrapper: install.dirs $(npwrapper_LIBRARY) - $(INSTALL) -m 755 $(STRIP_OPT) $(npwrapper_LIBRARY) $(DESTDIR)$(nphostdir)/$(npwrapper_LIBRARY) - ifeq ($(build_viewer),yes) --install.viewer: install.viewer.bin install.viewer.glue --install.libnoxshm: do.install.libnoxshm -+install.viewer: install.dirs install.viewer.bin install.viewer.glue -+install.libnoxshm: install.dirs do.install.libnoxshm - else - install.viewer: - install.libnoxshm: +@@ -260,7 +256,7 @@ endif --install.viewer.bin: $(npviewer_PROGRAM) -+install.viewer.bin: install.dirs $(npviewer_PROGRAM) + install.viewer.bin: $(npviewer_PROGRAM) $(INSTALL) -m 755 $(STRIP_OPT) $(npviewer_PROGRAM) $(DESTDIR)$(nptargetdir)/$(npviewer_PROGRAM) -install.viewer.glue:: -+install.viewer.glue:: install.dirs ++install.viewer.glue:: install.viewer.bin p=$(DESTDIR)$(nptargetdir)/$(npviewer_PROGRAM:%.bin=%); \ echo "#!/bin/sh" > $$p; \ echo "TARGET_OS=$(TARGET_OS)" >> $$p; \ -@@ -272,13 +272,13 @@ - echo "esac" >> $$p; \ - echo ". $(npcommondir)/$(nploader_PROGRAM)" >> $$p; \ - chmod 755 $$p --do.install.libnoxshm: $(libnoxshm_LIBRARY) -+do.install.libnoxshm: install.dirs $(libnoxshm_LIBRARY) - $(INSTALL) -m 755 $(STRIP_OPT) $(libnoxshm_LIBRARY) $(DESTDIR)$(nptargetdir)/$(libnoxshm_LIBRARY) --install.config: $(npconfig_PROGRAM) -+install.config: install.dirs $(npconfig_PROGRAM) - $(INSTALL) -m 755 $(STRIP_OPT) $(npconfig_PROGRAM) $(DESTDIR)$(nphostdir)/$(npconfig_PROGRAM) - mkdir -p $(DESTDIR)$(bindir) - $(LN_S) $(nphostdir)/$(npconfig_PROGRAM) $(DESTDIR)$(bindir)/nspluginwrapper --install.loader: $(nploader_PROGRAM) -+install.loader: install.dirs $(nploader_PROGRAM) - $(INSTALL) -m 755 $(nploader_PROGRAM) $(DESTDIR)$(npcommondir)/$(nploader_PROGRAM) - install.mkruntime: $(SRC_PATH)/utils/mkruntime.sh - $(INSTALL) -m 755 $< $(DESTDIR)$(npcommondir)/mkruntime |