diff options
Diffstat (limited to 'meta/recipes-bsp/gnu-efi/gnu-efi')
| -rw-r--r-- | meta/recipes-bsp/gnu-efi/gnu-efi/lib-Makefile-fix-parallel-issue.patch | 14 | ||||
| -rw-r--r-- | meta/recipes-bsp/gnu-efi/gnu-efi/parallel-make-archives.patch | 16 |
2 files changed, 16 insertions, 14 deletions
diff --git a/meta/recipes-bsp/gnu-efi/gnu-efi/lib-Makefile-fix-parallel-issue.patch b/meta/recipes-bsp/gnu-efi/gnu-efi/lib-Makefile-fix-parallel-issue.patch index 1b2ae1ef06..dc00b8fa4d 100644 --- a/meta/recipes-bsp/gnu-efi/gnu-efi/lib-Makefile-fix-parallel-issue.patch +++ b/meta/recipes-bsp/gnu-efi/gnu-efi/lib-Makefile-fix-parallel-issue.patch @@ -1,7 +1,7 @@ -From 0daa354a16aa3cade56ed423d0f8a04cf1c22f9d Mon Sep 17 00:00:00 2001 +From 3ec8c2a70304eabd5760937a4ec3fbc4068a77ed Mon Sep 17 00:00:00 2001 From: Robert Yang <liezhi.yang@windriver.com> Date: Thu, 23 Apr 2015 01:49:31 -0700 -Subject: [PATCH] lib/Makefile: fix parallel issue +Subject: [PATCH 2/3] lib/Makefile: fix parallel issue Fixed: Assembler messages: @@ -17,22 +17,22 @@ Upstream-Status: Pending Signed-off-by: Robert Yang <liezhi.yang@windriver.com> --- - lib/Makefile | 2 ++ + lib/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/Makefile b/lib/Makefile -index dc4b94a..f64d1ed 100644 +index 048751a..ed39bbb 100644 --- a/lib/Makefile +++ b/lib/Makefile -@@ -73,6 +73,8 @@ all: libsubdirs libefi.a +@@ -74,6 +74,8 @@ all: libsubdirs libefi.a libsubdirs: for sdir in $(SUBDIRS); do mkdir -p $$sdir; done +$(OBJS): libsubdirs + libefi.a: $(OBJS) - $(AR) rv $@ $(OBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) -- -1.7.9.5 +2.7.4 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 @@ -From 16865de66db33ca70872199e70d93efccecc8575 Mon Sep 17 00:00:00 2001 +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 @@ -17,13 +17,15 @@ 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(-) diff --git a/gnuefi/Makefile b/gnuefi/Makefile -index 2a61699..148106e 100644 +index 2a61699..89b560a 100644 --- a/gnuefi/Makefile +++ b/gnuefi/Makefile @@ -54,7 +54,8 @@ TARGETS = crt0-efi-$(ARCH).o libgnuefi.a @@ -32,23 +34,23 @@ index 2a61699..148106e 100644 -libgnuefi.a: $(patsubst %,libgnuefi.a(%),$(OBJS)) +libgnuefi.a: $(OBJS) -+ $(AR) rv $@ $(OBJS) ++ $(AR) $(ARFLAGS) $@ $(OBJS) clean: rm -f $(TARGETS) *~ *.o $(OBJS) diff --git a/lib/Makefile b/lib/Makefile -index b8d1ce7..6ef8107 100644 +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: $(OBJS) -- $(AR) rv -U $@ $^ -+ $(AR) rv $@ $(OBJS) +- $(AR) $(ARFLAGS) $@ $^ ++ $(AR) $(ARFLAGS) $@ $(OBJS) clean: rm -f libefi.a *~ $(OBJS) */*.o -- -2.9.4 +2.7.4 |