diff options
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.patch | 54 |
1 files changed, 30 insertions, 24 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 e5b47c197a..0110260bd8 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,7 @@ | |||
1 | Fix parallel make failure for archives | 1 | From 16865de66db33ca70872199e70d93efccecc8575 Mon Sep 17 00:00:00 2001 |
2 | From: Saul Wold <sgw@linux.intel.com> | ||
3 | Date: Sun, 9 Mar 2014 15:22:15 +0200 | ||
4 | Subject: [PATCH 1/3] Fix parallel make failure for archives | ||
2 | 5 | ||
3 | Upstream-Status: Pending | 6 | Upstream-Status: Pending |
4 | 7 | ||
@@ -12,31 +15,18 @@ for details. | |||
12 | 15 | ||
13 | Signed-off-by: Saul Wold <sgw@linux.intel.com> | 16 | Signed-off-by: Saul Wold <sgw@linux.intel.com> |
14 | Signed-off-by: Darren Hart <dvhart@linux.intel.com> | 17 | Signed-off-by: Darren Hart <dvhart@linux.intel.com> |
18 | [Rebased for 3.0.6] | ||
19 | Signed-off-by: California Sullivan <california.l.sullivan@intel.com> | ||
15 | --- | 20 | --- |
16 | --- | 21 | gnuefi/Makefile | 3 ++- |
17 | gnuefi/Makefile | 3 ++- | 22 | lib/Makefile | 2 +- |
18 | lib/Makefile | 3 ++- | 23 | 2 files changed, 3 insertions(+), 2 deletions(-) |
19 | 2 files changed, 4 insertions(+), 2 deletions(-) | ||
20 | 24 | ||
21 | Index: gnu-efi-3.0/lib/Makefile | 25 | diff --git a/gnuefi/Makefile b/gnuefi/Makefile |
22 | =================================================================== | 26 | index 2a61699..148106e 100644 |
23 | --- gnu-efi-3.0.orig/lib/Makefile | 27 | --- a/gnuefi/Makefile |
24 | +++ gnu-efi-3.0/lib/Makefile | 28 | +++ b/gnuefi/Makefile |
25 | @@ -66,7 +66,8 @@ all: libsubdirs libefi.a | 29 | @@ -54,7 +54,8 @@ TARGETS = crt0-efi-$(ARCH).o libgnuefi.a |
26 | libsubdirs: | ||
27 | for sdir in $(SUBDIRS); do mkdir -p $$sdir; done | ||
28 | |||
29 | -libefi.a: $(patsubst %,libefi.a(%),$(OBJS)) | ||
30 | +libefi.a: $(OBJS) | ||
31 | + $(AR) rv $@ $(OBJS) | ||
32 | |||
33 | clean: | ||
34 | rm -f libefi.a *~ $(OBJS) */*.o | ||
35 | Index: gnu-efi-3.0/gnuefi/Makefile | ||
36 | =================================================================== | ||
37 | --- gnu-efi-3.0.orig/gnuefi/Makefile | ||
38 | +++ gnu-efi-3.0/gnuefi/Makefile | ||
39 | @@ -51,7 +51,8 @@ TARGETS = crt0-efi-$(ARCH).o libgnuefi.a | ||
40 | 30 | ||
41 | all: $(TARGETS) | 31 | all: $(TARGETS) |
42 | 32 | ||
@@ -46,3 +36,19 @@ Index: gnu-efi-3.0/gnuefi/Makefile | |||
46 | 36 | ||
47 | clean: | 37 | clean: |
48 | rm -f $(TARGETS) *~ *.o $(OBJS) | 38 | rm -f $(TARGETS) *~ *.o $(OBJS) |
39 | diff --git a/lib/Makefile b/lib/Makefile | ||
40 | index b8d1ce7..6ef8107 100644 | ||
41 | --- a/lib/Makefile | ||
42 | +++ b/lib/Makefile | ||
43 | @@ -75,7 +75,7 @@ libsubdirs: | ||
44 | for sdir in $(SUBDIRS); do mkdir -p $$sdir; done | ||
45 | |||
46 | libefi.a: $(OBJS) | ||
47 | - $(AR) rv -U $@ $^ | ||
48 | + $(AR) rv $@ $(OBJS) | ||
49 | |||
50 | clean: | ||
51 | rm -f libefi.a *~ $(OBJS) */*.o | ||
52 | -- | ||
53 | 2.9.4 | ||
54 | |||