Message ID | 20171212213355.5f25754e@endymion |
---|---|
State | Awaiting Upstream |
Headers | show |
Series | [i2c-tools] tools/Module.mk: Add missing dependencies | expand |
On Tue, Dec 12, 2017 at 9:33 PM, Jean Delvare <jdelvare@suse.de> wrote: > Better build the library before building the tools which link against > it, otherwise parallel builds could run into a race and break. Tested-by: Angelo Compagnucci <angelo@amarulasolutions.com> Acked-by: Angelo Compagnucci <angelo@amarulasolutions.com> > --- > 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) > > # > > > -- > Jean Delvare > SUSE L3 Support
On Wed, 13 Dec 2017 11:36:31 +0100, Angelo Compagnucci wrote: > On Tue, Dec 12, 2017 at 9:33 PM, Jean Delvare <jdelvare@suse.de> wrote: > > Better build the library before building the tools which link against > > it, otherwise parallel builds could run into a race and break. > > Tested-by: Angelo Compagnucci <angelo@amarulasolutions.com> > Acked-by: Angelo Compagnucci <angelo@amarulasolutions.com> Thank you Angelo, your review and testing is highly appreciated :-) Fix committed.
On Thu, Dec 14, 2017 at 8:53 AM, Jean Delvare <jdelvare@suse.de> wrote: > On Wed, 13 Dec 2017 11:36:31 +0100, Angelo Compagnucci wrote: >> On Tue, Dec 12, 2017 at 9:33 PM, Jean Delvare <jdelvare@suse.de> wrote: >> > Better build the library before building the tools which link against >> > it, otherwise parallel builds could run into a race and break. >> >> Tested-by: Angelo Compagnucci <angelo@amarulasolutions.com> >> Acked-by: Angelo Compagnucci <angelo@amarulasolutions.com> > > Thank you Angelo, your review and testing is highly appreciated :-) You're welcome! Could you please review this one: https://patchwork.ozlabs.org/patch/847141/ Thanks! > > Fix committed. > > -- > Jean Delvare > SUSE L3 Support
On Thu, 14 Dec 2017 09:12:58 +0100, Angelo Compagnucci wrote: > On Thu, Dec 14, 2017 at 8:53 AM, Jean Delvare <jdelvare@suse.de> wrote: > > Thank you Angelo, your review and testing is highly appreciated :-) > > You're welcome! Could you please review this one: > https://patchwork.ozlabs.org/patch/847141/ Certainly. I don't think I received that one, you forgot to Cc me maybe?
On Thu, Dec 14, 2017 at 9:19 AM, Jean Delvare <jdelvare@suse.de> wrote: > On Thu, 14 Dec 2017 09:12:58 +0100, Angelo Compagnucci wrote: >> On Thu, Dec 14, 2017 at 8:53 AM, Jean Delvare <jdelvare@suse.de> wrote: >> > Thank you Angelo, your review and testing is highly appreciated :-) >> >> You're welcome! Could you please review this one: >> https://patchwork.ozlabs.org/patch/847141/ > > Certainly. I don't think I received that one, you forgot to Cc me maybe? Yes, unfortunately ... Thanks! > > -- > Jean Delvare > SUSE L3 Support
--- 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) #