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 | 48 |
1 files changed, 19 insertions, 29 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..8a0138bbe5 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 @@ -Fix parallel make failure for archives +From 48b2cdbcd761105e8ebad412fcbf23db1ac4ef7c 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 Upstream-Status: Pending @@ -12,37 +15,24 @@ for details. Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Darren Hart <dvhart@linux.intel.com> ---- ---- - gnuefi/Makefile | 3 ++- - lib/Makefile | 3 ++- - 2 files changed, 4 insertions(+), 2 deletions(-) +[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> -Index: gnu-efi-3.0/lib/Makefile -=================================================================== ---- gnu-efi-3.0.orig/lib/Makefile -+++ gnu-efi-3.0/lib/Makefile -@@ -66,7 +66,8 @@ all: libsubdirs libefi.a - libsubdirs: +diff --git a/lib/Makefile b/lib/Makefile +index 0e6410d..048751a 100644 +--- a/lib/Makefile ++++ b/lib/Makefile +@@ -75,7 +75,7 @@ libsubdirs: for sdir in $(SUBDIRS); do mkdir -p $$sdir; done --libefi.a: $(patsubst %,libefi.a(%),$(OBJS)) -+libefi.a: $(OBJS) -+ $(AR) rv $@ $(OBJS) + libefi.a: $(OBJS) +- $(AR) $(ARFLAGS) $@ $^ ++ $(AR) $(ARFLAGS) $@ $(OBJS) clean: rm -f libefi.a *~ $(OBJS) */*.o -Index: gnu-efi-3.0/gnuefi/Makefile -=================================================================== ---- gnu-efi-3.0.orig/gnuefi/Makefile -+++ gnu-efi-3.0/gnuefi/Makefile -@@ -51,7 +51,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) +-- +2.7.4 + |