Another parallel build fix (bug #375121).

(Portage version: 2.1.10.4/cvs/Linux x86_64)

5 files changed, 41 insertions, 9 deletions

diff --git a/www-plugins/nspluginwrapper/ChangeLog b/www-plugins/nspluginwrapper/ChangeLog
index 7c84d50930f0..0430bc95cbe4 100644
--- a/www-plugins/nspluginwrapper/ChangeLog
+++ b/www-plugins/nspluginwrapper/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-plugins/nspluginwrapper
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/nspluginwrapper/ChangeLog,v 1.22 2011/07/13 15:56:30 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/nspluginwrapper/ChangeLog,v 1.23 2011/07/14 16:09:41 chutzpah Exp $
+
+  14 Jul 2011; Patrick McLean <chutzpah@gentoo.org>
+  -files/nspluginwrapper-1.4.2-parallel-make.patch,
+  nspluginwrapper-1.4.4.ebuild, nspluginwrapper-1.4.4-r1.ebuild,
+  files/nspluginwrapper-1.4.4-compile-on-hardened.patch,
+  +files/nspluginwrapper-1.4.4-parallel-make.patch:
+  Another parallel build fix (bug #375121).
 
 *nspluginwrapper-1.4.4-r1 (11 Jul 2011)
 
diff --git a/www-plugins/nspluginwrapper/files/nspluginwrapper-1.4.4-compile-on-hardened.patch b/www-plugins/nspluginwrapper/files/nspluginwrapper-1.4.4-compile-on-hardened.patch
index 45d6be54e999..6d9adc20e9b3 100644
--- a/www-plugins/nspluginwrapper/files/nspluginwrapper-1.4.4-compile-on-hardened.patch
+++ b/www-plugins/nspluginwrapper/files/nspluginwrapper-1.4.4-compile-on-hardened.patch
@@ -1,9 +1,10 @@
---- b/Makefile	2011-06-29 02:10:27.000000000 +0200
-+++ a/Makefile	2011-06-29 02:09:06.000000000 +0200
-@@ -333,7 +333,7 @@
+diff -ur nspluginwrapper-1.4.4.orig2//Makefile nspluginwrapper-1.4.4/Makefile
+--- nspluginwrapper-1.4.4.orig2//Makefile	2011-07-14 11:56:52.674790086 -0400
++++ nspluginwrapper-1.4.4/Makefile	2011-07-14 12:01:00.281197722 -0400
+@@ -337,7 +337,7 @@
  	@[ -d $(LSB_OBJ_DIR) ] || mkdir $(LSB_OBJ_DIR) > /dev/null 2>&1
  
- $(LSB_OBJ_DIR)/%.o: $(LSB_SRC_DIR)/%.c
+ $(LSB_OBJ_DIR)/%.o: $(LSB_SRC_DIR)/%.c $(LSB_OBJ_DIR)
 -	$(CC) $(CFLAGS_32) -nostdinc -fno-builtin -I. -I$(LSB_INC_DIR) -c $< -o $@
 +	$(CC) $(CFLAGS_32) -nostdinc -fno-builtin -I. -I$(LSB_INC_DIR) -c -fno-stack-protector $< -o $@
  
diff --git a/www-plugins/nspluginwrapper/files/nspluginwrapper-1.4.2-parallel-make.patch b/www-plugins/nspluginwrapper/files/nspluginwrapper-1.4.4-parallel-make.patch
index b3280d6b2c75..95a7e49d6afa 100644
--- a/www-plugins/nspluginwrapper/files/nspluginwrapper-1.4.2-parallel-make.patch
+++ b/www-plugins/nspluginwrapper/files/nspluginwrapper-1.4.4-parallel-make.patch
@@ -65,3 +65,27 @@ diff -ur nspluginwrapper-1.4.2.orig//Makefile nspluginwrapper-1.4.2/Makefile
  	$(INSTALL) -m 755 $(nploader_PROGRAM) $(DESTDIR)$(npcommondir)/$(nploader_PROGRAM)
  install.mkruntime: $(SRC_PATH)/utils/mkruntime.sh
  	$(INSTALL) -m 755 $< $(DESTDIR)$(npcommondir)/mkruntime
+Only in nspluginwrapper-1.4.4: .Makefile.swp
+diff -ur nspluginwrapper-1.4.4.orig//Makefile nspluginwrapper-1.4.4/Makefile
+--- nspluginwrapper-1.4.4.orig//Makefile	2011-06-30 23:18:57.000000000 -0400
++++ nspluginwrapper-1.4.4/Makefile	2011-07-14 11:56:52.674790086 -0400
+@@ -333,16 +333,16 @@
+ 	sed -e 's|%NPW_VIEWER_DIR%|$(nptargetdir_var)|' $< > $@
+ 	chmod 755 $@
+ 
+-$(LSB_OBJ_DIR)::
++$(LSB_OBJ_DIR):
+ 	@[ -d $(LSB_OBJ_DIR) ] || mkdir $(LSB_OBJ_DIR) > /dev/null 2>&1
+ 
+-$(LSB_OBJ_DIR)/%.o: $(LSB_SRC_DIR)/%.c
++$(LSB_OBJ_DIR)/%.o: $(LSB_SRC_DIR)/%.c $(LSB_OBJ_DIR)
+ 	$(CC) $(CFLAGS_32) -nostdinc -fno-builtin -I. -I$(LSB_INC_DIR) -c $< -o $@
+ 
+ $(LSB_OBJ_DIR)/%.a: $(LSB_OBJ_DIR)/%.o
+ 	$(AR) rc $@ $<
+ 
+-$(LSB_OBJ_DIR)/libc.so: $(LSB_OBJ_DIR)/libc_main.so $(LSB_OBJ_DIR)/libc_nonshared.a
++$(LSB_OBJ_DIR)/libc.so: $(LSB_OBJ_DIR)/libc_main.so $(LSB_OBJ_DIR)/libc_nonshared.a $(LSB_OBJ_DIR)
+ 	@echo "OUTPUT_FORMAT($(TARGET_ELF_ARCH))" > $@
+ 	@echo "GROUP ( $(LSB_OBJ_DIR)/libc_main.so $(LSB_OBJ_DIR)/libc_nonshared.a )" >> $@
+ 
diff --git a/www-plugins/nspluginwrapper/nspluginwrapper-1.4.4-r1.ebuild b/www-plugins/nspluginwrapper/nspluginwrapper-1.4.4-r1.ebuild
index 9abdb3294522..3f84469f3dbc 100644
--- a/www-plugins/nspluginwrapper/nspluginwrapper-1.4.4-r1.ebuild
+++ b/www-plugins/nspluginwrapper/nspluginwrapper-1.4.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/nspluginwrapper/nspluginwrapper-1.4.4-r1.ebuild,v 1.1 2011/07/11 15:00:41 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/nspluginwrapper/nspluginwrapper-1.4.4-r1.ebuild,v 1.2 2011/07/14 16:09:41 chutzpah Exp $
 
 EAPI=2
 
@@ -45,7 +45,7 @@ autoinstall() {
 
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-1.3.0-gdk-native-windows.patch"
-	epatch "${FILESDIR}/${PN}-1.4.2-parallel-make.patch"
+	epatch "${FILESDIR}/${P}-parallel-make.patch"
 	epatch "${FILESDIR}/${P}-compile-on-hardened.patch"
 	sed -i -r "s:^libnoxshm_LDFLAGS = :libnoxshm_LDFLAGS = -L/usr/$(ABI=x86 get_libdir)/ :" Makefile
 }
diff --git a/www-plugins/nspluginwrapper/nspluginwrapper-1.4.4.ebuild b/www-plugins/nspluginwrapper/nspluginwrapper-1.4.4.ebuild
index 1b11b238f709..3484c0a8ca01 100644
--- a/www-plugins/nspluginwrapper/nspluginwrapper-1.4.4.ebuild
+++ b/www-plugins/nspluginwrapper/nspluginwrapper-1.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/nspluginwrapper/nspluginwrapper-1.4.4.ebuild,v 1.3 2011/07/05 07:49:27 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/nspluginwrapper/nspluginwrapper-1.4.4.ebuild,v 1.4 2011/07/14 16:09:41 chutzpah Exp $
 
 EAPI=2
 
@@ -45,7 +45,7 @@ autoinstall() {
 
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-1.3.0-gdk-native-windows.patch"
-	epatch "${FILESDIR}/${PN}-1.4.2-parallel-make.patch"
+	epatch "${FILESDIR}/${P}-parallel-make.patch"
 	epatch "${FILESDIR}/${P}-compile-on-hardened.patch"
 }