Skip to content

Commit

Permalink
Merge pull request #401 from bradbishop/pflash-build
Browse files Browse the repository at this point in the history
Add pflash parallel build fix patch
  • Loading branch information
williamspatrick committed Jun 29, 2016
2 parents 2d1d6b7 + 642b5f4 commit 856271d
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ SRC_URI += "file://0003-external-Fix-pflash-install-target.patch"
SRC_URI += "file://0004-external-Remove-m64-from-shared-CFLAGS-on-ARM.patch"
SRC_URI += "file://0005-external-Create-shared-rules.mk.patch"
SRC_URI += "file://0006-external-Add-dynamically-linked-pflash.patch"
SRC_URI += "file://0007-external-Fix-ARM-build-failure-with-parallel-make.patch"

LIC_FILES_CHKSUM = "file://${S}/LICENCE;md5=3b83ef96387f14655fc854ddc3c6bd57"

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
From 55749b091414e0cf2691bd8f72c4cb48235b51c3 Mon Sep 17 00:00:00 2001
From: Brad Bishop <bradleyb@fuzziesquirrel.com>
Date: Mon, 20 Jun 2016 20:31:07 -0400
Subject: [PATCH] external: Fix ARM build failure with parallel make

Arch headers need to be linked in before compiling.

Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
---
external/common/rules.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/external/common/rules.mk b/external/common/rules.mk
index 5558cd3..bb12fd5 100644
--- a/external/common/rules.mk
+++ b/external/common/rules.mk
@@ -67,7 +67,7 @@ arch_clean:

$(ARCH_SRC): | common

-$(ARCH_OBJS): common-%.o: common/%.c
+$(ARCH_OBJS): common-%.o: common/%.c $(ARCH_LINKS)
$(Q_CC)$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@

common-arch_flash.o: $(ARCH_OBJS)
--
1.8.3.1

0 comments on commit 856271d

Please sign in to comment.