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 | 39 |
1 files changed, 12 insertions, 27 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..63d9b6fc31 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,7 +1,7 @@ -From 16865de66db33ca70872199e70d93efccecc8575 Mon Sep 17 00:00:00 2001 +From f56ddb00a656af2e84f839738fad19909ac65047 Mon Sep 17 00:00:00 2001 From: Saul Wold <sgw@linux.intel.com> Date: Sun, 9 Mar 2014 15:22:15 +0200 -Subject: [PATCH 1/3] Fix parallel make failure for archives +Subject: [PATCH] Fix parallel make failure for archives Upstream-Status: Pending @@ -17,38 +17,23 @@ Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Darren Hart <dvhart@linux.intel.com> [Rebased for 3.0.6] Signed-off-by: California Sullivan <california.l.sullivan@intel.com> +[Rebased for 3.0.8] +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> + --- - gnuefi/Makefile | 3 ++- - lib/Makefile | 2 +- - 2 files changed, 3 insertions(+), 2 deletions(-) + lib/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/gnuefi/Makefile b/gnuefi/Makefile -index 2a61699..148106e 100644 ---- a/gnuefi/Makefile -+++ b/gnuefi/Makefile -@@ -54,7 +54,8 @@ TARGETS = crt0-efi-$(ARCH).o libgnuefi.a - - all: $(TARGETS) - --libgnuefi.a: $(patsubst %,libgnuefi.a(%),$(OBJS)) -+libgnuefi.a: $(OBJS) -+ $(AR) rv $@ $(OBJS) - - clean: - rm -f $(TARGETS) *~ *.o $(OBJS) diff --git a/lib/Makefile b/lib/Makefile -index b8d1ce7..6ef8107 100644 +index 1fc6a47..54b0ca7 100644 --- a/lib/Makefile +++ b/lib/Makefile -@@ -75,7 +75,7 @@ libsubdirs: - for sdir in $(SUBDIRS); do mkdir -p $$sdir; done +@@ -77,7 +77,7 @@ libsubdirs: + $(OBJS): libsubdirs libefi.a: $(OBJS) -- $(AR) rv -U $@ $^ -+ $(AR) rv $@ $(OBJS) +- $(AR) $(ARFLAGS) $@ $^ ++ $(AR) $(ARFLAGS) $@ $(OBJS) clean: rm -f libefi.a *~ $(OBJS) */*.o --- -2.9.4 - |