mirror of
https://git.yoctoproject.org/poky
synced 2026-02-08 18:02:12 +01:00
bc2d5c5c1c
The patch tool will apply patches by default with "fuzz", which is where if the hunk context isn't present but what is there is close enough, it will force the patch in. Whilst this is useful when there's just whitespace changes, when applied to source it is possible for a patch applied with fuzz to produce broken code which still compiles (see #10450). This is obviously bad. We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For that to be realistic the existing patches with fuzz need to be rebased and reviewed. (From OE-Core rev: 00677e03156228f752476520911c19d4156db8da) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
67 lines
2.5 KiB
Diff
67 lines
2.5 KiB
Diff
From 08b0d67ba7eceb862cb17f52eb1911e9579726ea Mon Sep 17 00:00:00 2001
|
|
From: Jean Delvare <jdelvare@suse.de>
|
|
Date: Thu, 14 Dec 2017 08:52:26 +0100
|
|
Subject: [PATCH] tools/Module.mk: Add missing dependencies
|
|
|
|
Better build the library before building the tools which link against
|
|
it, otherwise parallel builds could run into a race and break.
|
|
|
|
Upstream-Status: Backport
|
|
|
|
Signed-off-by: Jean Delvare <jdelvare@suse.de>
|
|
Tested-by: Angelo Compagnucci <angelo@amarulasolutions.com>
|
|
Acked-by: Angelo Compagnucci <angelo@amarulasolutions.com>
|
|
Signed-off-by: Maxin B. John <maxin.john@intel.com>
|
|
---
|
|
lib/Module.mk | 7 +++++++
|
|
tools/Module.mk | 10 +++++-----
|
|
2 files changed, 12 insertions(+), 5 deletions(-)
|
|
|
|
Index: i2c-tools-4.0/lib/Module.mk
|
|
===================================================================
|
|
--- i2c-tools-4.0.orig/lib/Module.mk
|
|
+++ i2c-tools-4.0/lib/Module.mk
|
|
@@ -35,6 +35,13 @@ LIB_TARGETS += $(LIB_STLIBNAME)
|
|
LIB_OBJECTS += smbus.ao
|
|
endif
|
|
|
|
+# Library file to link against (static or dynamic)
|
|
+ifeq ($(USE_STATIC_LIB),1)
|
|
+LIB_DEPS := $(LIB_DIR)/$(LIB_STLIBNAME)
|
|
+else
|
|
+LIB_DEPS := $(LIB_DIR)/$(LIB_SHBASENAME)
|
|
+endif
|
|
+
|
|
#
|
|
# Libraries
|
|
#
|
|
Index: i2c-tools-4.0/tools/Module.mk
|
|
===================================================================
|
|
--- i2c-tools-4.0.orig/tools/Module.mk
|
|
+++ i2c-tools-4.0/tools/Module.mk
|
|
@@ -24,19 +24,19 @@ TOOLS_TARGETS := i2cdetect i2cdump i2cse
|
|
# Programs
|
|
#
|
|
|
|
-$(TOOLS_DIR)/i2cdetect: $(TOOLS_DIR)/i2cdetect.o $(TOOLS_DIR)/i2cbusses.o
|
|
+$(TOOLS_DIR)/i2cdetect: $(TOOLS_DIR)/i2cdetect.o $(TOOLS_DIR)/i2cbusses.o $(LIB_DEPS)
|
|
$(CC) $(LDFLAGS) -o $@ $^ $(TOOLS_LDFLAGS)
|
|
|
|
-$(TOOLS_DIR)/i2cdump: $(TOOLS_DIR)/i2cdump.o $(TOOLS_DIR)/i2cbusses.o $(TOOLS_DIR)/util.o
|
|
+$(TOOLS_DIR)/i2cdump: $(TOOLS_DIR)/i2cdump.o $(TOOLS_DIR)/i2cbusses.o $(TOOLS_DIR)/util.o $(LIB_DEPS)
|
|
$(CC) $(LDFLAGS) -o $@ $^ $(TOOLS_LDFLAGS)
|
|
|
|
-$(TOOLS_DIR)/i2cset: $(TOOLS_DIR)/i2cset.o $(TOOLS_DIR)/i2cbusses.o $(TOOLS_DIR)/util.o
|
|
+$(TOOLS_DIR)/i2cset: $(TOOLS_DIR)/i2cset.o $(TOOLS_DIR)/i2cbusses.o $(TOOLS_DIR)/util.o $(LIB_DEPS)
|
|
$(CC) $(LDFLAGS) -o $@ $^ $(TOOLS_LDFLAGS)
|
|
|
|
-$(TOOLS_DIR)/i2cget: $(TOOLS_DIR)/i2cget.o $(TOOLS_DIR)/i2cbusses.o $(TOOLS_DIR)/util.o
|
|
+$(TOOLS_DIR)/i2cget: $(TOOLS_DIR)/i2cget.o $(TOOLS_DIR)/i2cbusses.o $(TOOLS_DIR)/util.o $(LIB_DEPS)
|
|
$(CC) $(LDFLAGS) -o $@ $^ $(TOOLS_LDFLAGS)
|
|
|
|
-$(TOOLS_DIR)/i2ctransfer: $(TOOLS_DIR)/i2ctransfer.o $(TOOLS_DIR)/i2cbusses.o $(TOOLS_DIR)/util.o
|
|
+$(TOOLS_DIR)/i2ctransfer: $(TOOLS_DIR)/i2ctransfer.o $(TOOLS_DIR)/i2cbusses.o $(TOOLS_DIR)/util.o $(LIB_DEPS)
|
|
$(CC) $(LDFLAGS) -o $@ $^ $(TOOLS_LDFLAGS)
|
|
|
|
#
|