[gentoo-commits] gentoo-x86 commit in sys-fs/mtd-utils/files: mtd-utils-fixup.patch

[Robin H. Johnson (robbat2)]

robbat2     08/09/24 02:11:19

  Added:                mtd-utils-fixup.patch
  Log:
  Fix inverted xattr logic per bug #238435 and also parallel build.
  (Portage version: 2.2_rc8/cvs/Linux 2.6.27-rc1-10246-gca5de40 x86_64)

Revision  Changes    Path
1.1                  sys-fs/mtd-utils/files/mtd-utils-fixup.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/mtd-utils/files/mtd-utils-fixup.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/mtd-utils/files/mtd-utils-fixup.patch?rev=1.1&content-type=text/plain

Index: mtd-utils-fixup.patch
===================================================================
Fix up the parallel building. Without this fix, each instance of the NTARGETS
will try to build the libraries seperately, and on a suitably fast machine this
can lead to overwriting. Add a specific instance to build the libraries first.

Signed-off-by: Robin H. Johnson <robbat2@g.o>

diff -Nuar mtd-utils.orig/ubi-utils/Makefile mtd-utils/ubi-utils/Makefile
--- mtd-utils.orig/ubi-utils/Makefile	2008-09-23 18:51:00.129193374 -0700
+++ mtd-utils/ubi-utils/Makefile	2008-09-23 18:54:04.097290355 -0700
@@ -34,7 +34,10 @@
 IGNORE=${wildcard .*.c.dep}
 -include ${IGNORE}
 
-$(NTARGETS):
+nlibs:
+	$(MAKE) -C new-utils libs
+
+$(NTARGETS): nlibs
 	$(MAKE) -C new-utils $@
 	mv new-utils/$@ $@
 
diff -Nuar mtd-utils.orig/ubi-utils/new-utils/Makefile mtd-utils/ubi-utils/new-utils/Makefile
--- mtd-utils.orig/ubi-utils/new-utils/Makefile	2008-09-23 18:51:00.179204851 -0700
+++ mtd-utils/ubi-utils/new-utils/Makefile	2008-09-23 18:53:32.513881545 -0700
@@ -19,6 +19,7 @@
 vpath %.c src
 
 all: $(UTILS)
+libs: $(addsuffix .a,$(LIBS))
 
 # The below cancels existing implicite rule to make programs from .c files,
 # in order to force make using our rule defined below