summaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp/gnu-efi/gnu-efi/parallel-make-archives.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-bsp/gnu-efi/gnu-efi/parallel-make-archives.patch')
-rw-r--r--meta/recipes-bsp/gnu-efi/gnu-efi/parallel-make-archives.patch16
1 files changed, 9 insertions, 7 deletions
diff --git a/meta/recipes-bsp/gnu-efi/gnu-efi/parallel-make-archives.patch b/meta/recipes-bsp/gnu-efi/gnu-efi/parallel-make-archives.patch
index 0110260bd8..a9806cfdf6 100644
--- a/meta/recipes-bsp/gnu-efi/gnu-efi/parallel-make-archives.patch
+++ b/meta/recipes-bsp/gnu-efi/gnu-efi/parallel-make-archives.patch
@@ -1,4 +1,4 @@
1From 16865de66db33ca70872199e70d93efccecc8575 Mon Sep 17 00:00:00 2001 1From 48b2cdbcd761105e8ebad412fcbf23db1ac4ef7c Mon Sep 17 00:00:00 2001
2From: Saul Wold <sgw@linux.intel.com> 2From: Saul Wold <sgw@linux.intel.com>
3Date: Sun, 9 Mar 2014 15:22:15 +0200 3Date: Sun, 9 Mar 2014 15:22:15 +0200
4Subject: [PATCH 1/3] Fix parallel make failure for archives 4Subject: [PATCH 1/3] Fix parallel make failure for archives
@@ -17,13 +17,15 @@ Signed-off-by: Saul Wold <sgw@linux.intel.com>
17Signed-off-by: Darren Hart <dvhart@linux.intel.com> 17Signed-off-by: Darren Hart <dvhart@linux.intel.com>
18[Rebased for 3.0.6] 18[Rebased for 3.0.6]
19Signed-off-by: California Sullivan <california.l.sullivan@intel.com> 19Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
20[Rebased for 3.0.8]
21Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
20--- 22---
21 gnuefi/Makefile | 3 ++- 23 gnuefi/Makefile | 3 ++-
22 lib/Makefile | 2 +- 24 lib/Makefile | 2 +-
23 2 files changed, 3 insertions(+), 2 deletions(-) 25 2 files changed, 3 insertions(+), 2 deletions(-)
24 26
25diff --git a/gnuefi/Makefile b/gnuefi/Makefile 27diff --git a/gnuefi/Makefile b/gnuefi/Makefile
26index 2a61699..148106e 100644 28index 2a61699..89b560a 100644
27--- a/gnuefi/Makefile 29--- a/gnuefi/Makefile
28+++ b/gnuefi/Makefile 30+++ b/gnuefi/Makefile
29@@ -54,7 +54,8 @@ TARGETS = crt0-efi-$(ARCH).o libgnuefi.a 31@@ -54,7 +54,8 @@ TARGETS = crt0-efi-$(ARCH).o libgnuefi.a
@@ -32,23 +34,23 @@ index 2a61699..148106e 100644
32 34
33-libgnuefi.a: $(patsubst %,libgnuefi.a(%),$(OBJS)) 35-libgnuefi.a: $(patsubst %,libgnuefi.a(%),$(OBJS))
34+libgnuefi.a: $(OBJS) 36+libgnuefi.a: $(OBJS)
35+ $(AR) rv $@ $(OBJS) 37+ $(AR) $(ARFLAGS) $@ $(OBJS)
36 38
37 clean: 39 clean:
38 rm -f $(TARGETS) *~ *.o $(OBJS) 40 rm -f $(TARGETS) *~ *.o $(OBJS)
39diff --git a/lib/Makefile b/lib/Makefile 41diff --git a/lib/Makefile b/lib/Makefile
40index b8d1ce7..6ef8107 100644 42index 0e6410d..048751a 100644
41--- a/lib/Makefile 43--- a/lib/Makefile
42+++ b/lib/Makefile 44+++ b/lib/Makefile
43@@ -75,7 +75,7 @@ libsubdirs: 45@@ -75,7 +75,7 @@ libsubdirs:
44 for sdir in $(SUBDIRS); do mkdir -p $$sdir; done 46 for sdir in $(SUBDIRS); do mkdir -p $$sdir; done
45 47
46 libefi.a: $(OBJS) 48 libefi.a: $(OBJS)
47- $(AR) rv -U $@ $^ 49- $(AR) $(ARFLAGS) $@ $^
48+ $(AR) rv $@ $(OBJS) 50+ $(AR) $(ARFLAGS) $@ $(OBJS)
49 51
50 clean: 52 clean:
51 rm -f libefi.a *~ $(OBJS) */*.o 53 rm -f libefi.a *~ $(OBJS) */*.o
52-- 54--
532.9.4 552.7.4
54 56