bcb539788c
- Add upstream reference OBS-URL: https://build.opensuse.org/package/show/Base:System/i2c-tools?expand=0&rev=49
57 lines
2.0 KiB
Diff
57 lines
2.0 KiB
Diff
From: Jean Delvare <jdelvare@suse.de>
|
|
Date: Thu, 14 Dec 2017 08:52:26 +0100
|
|
Subject: tools/Module.mk: Add missing dependencies
|
|
Patch-mainline: yes
|
|
Git-commit: 08b0d67ba7eceb862cb17f52eb1911e9579726ea
|
|
|
|
Better build the library before building the tools which link against
|
|
it, otherwise parallel builds could run into a race and break.
|
|
---
|
|
lib/Module.mk | 7 +++++++
|
|
tools/Module.mk | 10 +++++-----
|
|
2 files changed, 12 insertions(+), 5 deletions(-)
|
|
|
|
--- a/lib/Module.mk
|
|
+++ b/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
|
|
#
|
|
--- a/tools/Module.mk
|
|
+++ b/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)
|
|
|
|
#
|