* [gentoo-commits] gentoo-x86 commit in www-plugins/nspluginwrapper/files: nspluginwrapper-1.4.0-parallel-make.patch
@ 2011-05-24 23:08 Patrick McLean (chutzpah)
0 siblings, 0 replies; 3+ messages in thread
From: Patrick McLean (chutzpah) @ 2011-05-24 23:08 UTC (permalink / raw
To: gentoo-commits
chutzpah 11/05/24 23:08:11
Added: nspluginwrapper-1.4.0-parallel-make.patch
Log:
Version bump, bug #365987. Clean dependency on setarch as it is no longer in the tree. Add patch to make installation work with parallel make.
(Portage version: 2.1.9.49/cvs/Linux x86_64)
Revision Changes Path
1.1 www-plugins/nspluginwrapper/files/nspluginwrapper-1.4.0-parallel-make.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/nspluginwrapper/files/nspluginwrapper-1.4.0-parallel-make.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/nspluginwrapper/files/nspluginwrapper-1.4.0-parallel-make.patch?rev=1.1&content-type=text/plain
Index: nspluginwrapper-1.4.0-parallel-make.patch
===================================================================
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) || :
ifeq ($(build_player),yes)
-install.player: $(npplayer_PROGRAM)
+install.player: install.dirs $(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:
endif
install.viewer.bin: $(npviewer_PROGRAM)
$(INSTALL) -m 755 $(STRIP_OPT) $(npviewer_PROGRAM) $(DESTDIR)$(nptargetdir)/$(npviewer_PROGRAM)
-install.viewer.glue::
+install.viewer.glue:: install.dirs
p=$(DESTDIR)$(nptargetdir)/$(npviewer_PROGRAM:%.bin=%); \
echo "#!/bin/sh" > $$p; \
echo "TARGET_OS=$(TARGET_OS)" >> $$p; \
@@ -274,11 +274,11 @@
chmod 755 $$p
do.install.libnoxshm: $(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
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in www-plugins/nspluginwrapper/files: nspluginwrapper-1.4.0-parallel-make.patch
@ 2011-05-26 15:19 Patrick McLean (chutzpah)
0 siblings, 0 replies; 3+ messages in thread
From: Patrick McLean (chutzpah) @ 2011-05-26 15:19 UTC (permalink / raw
To: gentoo-commits
chutzpah 11/05/26 15:19:28
Modified: nspluginwrapper-1.4.0-parallel-make.patch
Log:
Update parallel make patch, it appears that the earlier one failed on some systems (bug #274609).
(Portage version: 2.1.9.49/cvs/Linux x86_64)
Revision Changes Path
1.2 www-plugins/nspluginwrapper/files/nspluginwrapper-1.4.0-parallel-make.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/nspluginwrapper/files/nspluginwrapper-1.4.0-parallel-make.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/nspluginwrapper/files/nspluginwrapper-1.4.0-parallel-make.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/nspluginwrapper/files/nspluginwrapper-1.4.0-parallel-make.patch?r1=1.1&r2=1.2
Index: nspluginwrapper-1.4.0-parallel-make.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-plugins/nspluginwrapper/files/nspluginwrapper-1.4.0-parallel-make.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nspluginwrapper-1.4.0-parallel-make.patch 24 May 2011 23:08:11 -0000 1.1
+++ nspluginwrapper-1.4.0-parallel-make.patch 26 May 2011 15:19:28 -0000 1.2
@@ -25,16 +25,20 @@
install.viewer:
install.libnoxshm:
endif
- install.viewer.bin: $(npviewer_PROGRAM)
+-install.viewer.bin: $(npviewer_PROGRAM)
++install.viewer.bin: install.dirs $(npviewer_PROGRAM)
$(INSTALL) -m 755 $(STRIP_OPT) $(npviewer_PROGRAM) $(DESTDIR)$(nptargetdir)/$(npviewer_PROGRAM)
-install.viewer.glue::
+install.viewer.glue:: install.dirs
p=$(DESTDIR)$(nptargetdir)/$(npviewer_PROGRAM:%.bin=%); \
echo "#!/bin/sh" > $$p; \
echo "TARGET_OS=$(TARGET_OS)" >> $$p; \
-@@ -274,11 +274,11 @@
+@@ -272,13 +272,13 @@
+ echo "esac" >> $$p; \
+ echo ". $(npcommondir)/$(nploader_PROGRAM)" >> $$p; \
chmod 755 $$p
- do.install.libnoxshm: $(libnoxshm_LIBRARY)
+-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)
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in www-plugins/nspluginwrapper/files: nspluginwrapper-1.4.0-parallel-make.patch
@ 2011-05-26 15:55 Patrick McLean (chutzpah)
0 siblings, 0 replies; 3+ messages in thread
From: Patrick McLean (chutzpah) @ 2011-05-26 15:55 UTC (permalink / raw
To: gentoo-commits
chutzpah 11/05/26 15:55:45
Modified: nspluginwrapper-1.4.0-parallel-make.patch
Log:
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)
Revision Changes Path
1.3 www-plugins/nspluginwrapper/files/nspluginwrapper-1.4.0-parallel-make.patch
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
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
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
Index: nspluginwrapper-1.4.0-parallel-make.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-plugins/nspluginwrapper/files/nspluginwrapper-1.4.0-parallel-make.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nspluginwrapper-1.4.0-parallel-make.patch 26 May 2011 15:19:28 -0000 1.2
+++ nspluginwrapper-1.4.0-parallel-make.patch 26 May 2011 15:55:45 -0000 1.3
@@ -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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-05-26 15:55 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-05-26 15:19 [gentoo-commits] gentoo-x86 commit in www-plugins/nspluginwrapper/files: nspluginwrapper-1.4.0-parallel-make.patch Patrick McLean (chutzpah)
-- strict thread matches above, loose matches on Subject: below --
2011-05-26 15:55 Patrick McLean (chutzpah)
2011-05-24 23:08 Patrick McLean (chutzpah)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox