* [PATCH v2 0/2] libxl: test programs: fix Makefile races
@ 2014-02-06 19:22 Ian Jackson
2014-02-06 19:22 ` [PATCH 1/2] libxl: test programs: Fix Makefile race re headers Ian Jackson
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Ian Jackson @ 2014-02-06 19:22 UTC (permalink / raw)
To: xen-devel; +Cc: Olaf Hering, Ian Campbell
1/2 libxl: test programs: Fix Makefile race re headers
2/2 libxl: test programs: Fix make race re libxenlight.so
Patch 2 is new in this version.
I have pushed this here, too:
http://xenbits.xen.org/gitweb/?p=people/iwj/xen.git;a=shortlog;h=refs/heads/wip.libxl-test-makefile-race
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH 1/2] libxl: test programs: Fix Makefile race re headers 2014-02-06 19:22 [PATCH v2 0/2] libxl: test programs: fix Makefile races Ian Jackson @ 2014-02-06 19:22 ` Ian Jackson 2014-02-06 19:23 ` [PATCH 2/2] libxl: test programs: Fix make race re libxenlight.so Ian Jackson 2014-02-06 20:20 ` [PATCH v2 0/2] libxl: test programs: fix Makefile races Olaf Hering 2 siblings, 0 replies; 5+ messages in thread From: Ian Jackson @ 2014-02-06 19:22 UTC (permalink / raw) To: xen-devel; +Cc: Olaf Hering, Ian Jackson, Ian Campbell We need to include the new TEST_PROG_OBJS and LIBXL_TEST_OBJS in the appropriate dependencies. Otherwise we risk trying to build the test program before gentypes is run. Reported-by: Olaf Hering <olaf@aepfle.de> Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com> Cc: Olaf Hering <olaf@aepfle.de> Cc: Ian Campbell <Ian.Campbell@citrix.com> --- tools/libxl/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile index 66f3f3f..4af9033 100644 --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile @@ -130,7 +130,7 @@ all: $(CLIENTS) $(TEST_PROGS) \ $(AUTOSRCS) $(AUTOINCS) $(LIBXL_OBJS) $(LIBXLU_OBJS) $(XL_OBJS) $(SAVE_HELPER_OBJS) \ - $(LIBXL_TEST_OBJS): \ + $(LIBXL_TEST_OBJS) $(TEST_PROG_OBJS): \ $(AUTOINCS) libxl.api-ok %.c %.h:: %.y @@ -175,8 +175,9 @@ libxl_internal.h: _libxl_types_internal.h _paths.h libxl_internal_json.h: _libxl_types_internal_json.h xl.h: _paths.h -$(LIBXL_OBJS) $(LIBXLU_OBJS) $(XL_OBJS) $(SAVE_HELPER_OBJS): libxl.h -$(LIBXL_OBJS): libxl_internal.h +$(LIBXL_OBJS) $(LIBXL_TEST_OBJS) $(LIBXLU_OBJS) \ + $(XL_OBJS) $(TEST_PROG_OBJS) $(SAVE_HELPER_OBJS): libxl.h +$(LIBXL_OBJS) $(LIBXL_TEST_OBJS): libxl_internal.h _libxl_type%.h _libxl_type%_json.h _libxl_type%.c: libxl_type%.idl gentypes.py idl.py $(PYTHON) gentypes.py libxl_type$*.idl __libxl_type$*.h __libxl_type$*_json.h __libxl_type$*.c -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] libxl: test programs: Fix make race re libxenlight.so 2014-02-06 19:22 [PATCH v2 0/2] libxl: test programs: fix Makefile races Ian Jackson 2014-02-06 19:22 ` [PATCH 1/2] libxl: test programs: Fix Makefile race re headers Ian Jackson @ 2014-02-06 19:23 ` Ian Jackson 2014-02-06 20:20 ` [PATCH v2 0/2] libxl: test programs: fix Makefile races Olaf Hering 2 siblings, 0 replies; 5+ messages in thread From: Ian Jackson @ 2014-02-06 19:23 UTC (permalink / raw) To: xen-devel; +Cc: Olaf Hering, Ian Jackson, Ian Campbell The test programs were getting the proper libxenlight.so on their link line. Filter it out. Also change the soname of the test library to match the real one, so that libxutil is satisfied with it. Reported-by: Olaf Hering <olaf@aepfle.de> Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com> Cc: Olaf Hering <olaf@aepfle.de> Cc: Ian Campbell <Ian.Campbell@citrix.com> --- tools/libxl/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile index 4af9033..dab2929 100644 --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile @@ -195,7 +195,7 @@ libxenlight.so.$(MAJOR).$(MINOR): $(LIBXL_OBJS) $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenlight.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^ $(LIBXL_LIBS) $(APPEND_LDFLAGS) libxenlight_test.so: $(LIBXL_OBJS) $(LIBXL_TEST_OBJS) - $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenlight_test.so $(SHLIB_LDFLAGS) -o $@ $^ $(LIBXL_LIBS) $(APPEND_LDFLAGS) + $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenlight.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^ $(LIBXL_LIBS) $(APPEND_LDFLAGS) libxenlight.a: $(LIBXL_OBJS) $(AR) rcs libxenlight.a $^ @@ -216,7 +216,7 @@ xl: $(XL_OBJS) libxlutil.so libxenlight.so $(CC) $(LDFLAGS) -o $@ $(XL_OBJS) libxlutil.so $(LDLIBS_libxenlight) $(LDLIBS_libxenctrl) -lyajl $(APPEND_LDFLAGS) test_%: test_%.o test_common.o libxlutil.so libxenlight_test.so - $(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS_libxenlight) $(LDLIBS_libxenctrl) -lyajl $(APPEND_LDFLAGS) + $(CC) $(LDFLAGS) -o $@ $^ $(filter-out %libxenlight.so, $(LDLIBS_libxenlight)) $(LDLIBS_libxenctrl) -lyajl $(APPEND_LDFLAGS) libxl-save-helper: $(SAVE_HELPER_OBJS) libxenlight.so $(CC) $(LDFLAGS) -o $@ $(SAVE_HELPER_OBJS) $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(APPEND_LDFLAGS) -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v2 0/2] libxl: test programs: fix Makefile races 2014-02-06 19:22 [PATCH v2 0/2] libxl: test programs: fix Makefile races Ian Jackson 2014-02-06 19:22 ` [PATCH 1/2] libxl: test programs: Fix Makefile race re headers Ian Jackson 2014-02-06 19:23 ` [PATCH 2/2] libxl: test programs: Fix make race re libxenlight.so Ian Jackson @ 2014-02-06 20:20 ` Olaf Hering 2014-02-07 1:29 ` Ian Jackson 2 siblings, 1 reply; 5+ messages in thread From: Olaf Hering @ 2014-02-06 20:20 UTC (permalink / raw) To: Ian Jackson; +Cc: xen-devel, Ian Campbell On Thu, Feb 06, Ian Jackson wrote: > 1/2 libxl: test programs: Fix Makefile race re headers > 2/2 libxl: test programs: Fix make race re libxenlight.so > > Patch 2 is new in this version. Yes, these two patches fix the build failures for me. Thanks! Olaf ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2 0/2] libxl: test programs: fix Makefile races 2014-02-06 20:20 ` [PATCH v2 0/2] libxl: test programs: fix Makefile races Olaf Hering @ 2014-02-07 1:29 ` Ian Jackson 0 siblings, 0 replies; 5+ messages in thread From: Ian Jackson @ 2014-02-07 1:29 UTC (permalink / raw) To: Olaf Hering; +Cc: George Dunlap, xen-devel, Ian Campbell Olaf Hering writes ("Re: [PATCH v2 0/2] libxl: test programs: fix Makefile races"): > On Thu, Feb 06, Ian Jackson wrote: > > > 1/2 libxl: test programs: Fix Makefile race re headers > > 2/2 libxl: test programs: Fix make race re libxenlight.so > > > > Patch 2 is new in this version. > > Yes, these two patches fix the build failures for me. > Thanks! Good, thanks for the report and the tests. I have pushed those two right away, on the grounds that they're clearly necessary bugfixes. Thanks, Ian. ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-02-07 1:29 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-02-06 19:22 [PATCH v2 0/2] libxl: test programs: fix Makefile races Ian Jackson 2014-02-06 19:22 ` [PATCH 1/2] libxl: test programs: Fix Makefile race re headers Ian Jackson 2014-02-06 19:23 ` [PATCH 2/2] libxl: test programs: Fix make race re libxenlight.so Ian Jackson 2014-02-06 20:20 ` [PATCH v2 0/2] libxl: test programs: fix Makefile races Olaf Hering 2014-02-07 1:29 ` Ian Jackson
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).