Fix build with libnuma-dev on some distributions
Subsystems (2)
PATCH 1/1 Fix build with libnuma-dev on some distributions
On some distributions when libnuma-dev is installed the tst_numa.o, which was added to libltp.a pulls in symbols from numa library to random unrealted tests which breaks the build.
This commit hence moves the tst_numa to a separate libltpnuma.a library that is used for linking only for tests that actually use it and link with -lnuma.
---
This should fix the build failures, beware not build tested yet.
Makefile | 6 +++---
libnuma/Makefile | 10 ++++++++++
{lib => libnuma}/tst_numa.c | 0
testcases/kernel/syscalls/set_mempolicy/Makefile | 3 ++-
4 files changed, 15 insertions(+), 4 deletions(-)
create mode 100644 libnuma/Makefile
rename {lib => libnuma}/tst_numa.c (100%)Makefile +3 -3
@@ -77,7 +77,7 @@ INSTALL_TARGETS += runtest scenario_groups testscripts CLEAN_TARGETS += include runtest scenario_groups testscripts endif INSTALL_TARGETS += $(COMMON_TARGETS) -CLEAN_TARGETS += $(COMMON_TARGETS) lib +CLEAN_TARGETS += $(COMMON_TARGETS) lib libnuma BOOTSTRAP_TARGETS := $(sort $(COMMON_TARGETS) $(CLEAN_TARGETS) $(INSTALL_TARGETS)) CLEAN_TARGETS := $(addsuffix -clean,$(CLEAN_TARGETS))
@@ -89,7 +89,7 @@ MAKE_TARGETS := $(addsuffix -all,$(filter-out lib,$(COMMON_TARGETS))) # overtaxed one, or one where -j => 1 was specified. all: $(addsuffix -all,$(COMMON_TARGETS)) Version -$(MAKE_TARGETS): lib-all +$(MAKE_TARGETS): lib-all libnuma-all .PHONY: include-all include-install include-install: $(top_builddir)/include/config.h include/mk/config.mk include-all
@@ -110,7 +110,7 @@ $(sort $(addprefix $(abs_top_builddir)/,$(BOOTSTRAP_TARGETS)) $(INSTALL_DIR) $(D ## Pattern based subtarget rules. lib-install: lib-all -$(MAKE_TARGETS) include-all lib-all: +$(MAKE_TARGETS) include-all lib-all libnuma-all: $(MAKE) -C "$(subst -all,,$@)" \ -f "$(abs_top_srcdir)/$(subst -all,,$@)/Makefile" all
libnuma/Makefile new file +10 -0
@@ -0,0 +1,10 @@ +# + +top_srcdir ?= .. + +include $(top_srcdir)/include/mk/env_pre.mk + +LIB := libltpnuma.a + +include $(top_srcdir)/include/mk/lib.mk +include $(top_srcdir)/include/mk/generic_trunk_target.mk
libnuma/tst_numa.c renamed from lib/tst_numa.c +0 -0
testcases/kernel/syscalls/set_mempolicy/Makefile +2 -1
@@ -2,6 +2,7 @@ top_srcdir ?= ../../../.. include $(top_srcdir)/include/mk/testcases.mk -LDLIBS += $(NUMA_LIBS) +LDFLAGS += -L$(top_builddir)/libnuma +LDLIBS += $(NUMA_LIBS) -lltpnuma include $(top_srcdir)/include/mk/generic_leaf_target.mk
Signature · 1 line
2.19.2
PATCH 1/1 Fix build with libnuma-dev on some distributions
----- Original Message -----
Quoted 8 lines
On some distributions when libnuma-dev is installed the tst_numa.o, which was added to libltp.a pulls in symbols from numa library to random unrealted tests which breaks the build.
This commit hence moves the
tst_numato a separate libltpnuma.a library that is used for linking only for tests that actually use it and link with -lnuma.
Quoted 5 lines
Signed-off-by Cyril Hrubis <[email protected]>CC Jan Stancek <[email protected]>---
This should fix the build failures, beware not build tested yet.
I'm fine with approach. I'd suggest different directory name, but it's hard to come up with something nice. Maybe:
libnumafn, libnumautils (maybe taken), libtstnuma
Might be less confusing if it doesn't share same name as existing library.
Quoted 82 lines
Makefile | 6 +++--- libnuma/Makefile | 10 ++++++++++ {lib => libnuma}/tst_numa.c | 0 testcases/kernel/syscalls/set_mempolicy/Makefile | 3 ++- 4 files changed, 15 insertions(+), 4 deletions(-) create mode 100644 libnuma/Makefile rename {lib => libnuma}/tst_numa.c (100%)Makefile +1
-1@@ -77,7 +77,7 @@ INSTALL_TARGETS += runtest scenario_groups testscripts CLEAN_TARGETS += include runtest scenario_groups testscripts endif INSTALL_TARGETS += $(COMMON_TARGETS) -CLEAN_TARGETS += $(COMMON_TARGETS) lib +CLEAN_TARGETS += $(COMMON_TARGETS) lib libnuma BOOTSTRAP_TARGETS := $(sort $(COMMON_TARGETS) $(CLEAN_TARGETS) $(INSTALL_TARGETS))
CLEAN_TARGETS:= $(addsuffix -clean,$(CLEAN_TARGETS))Makefile +1
-1@@ -89,7 +89,7 @@ MAKE_TARGETS := $(addsuffix -all,$(filter-out lib,$(COMMON_TARGETS))) # overtaxed one, or one where -j => 1 was specified. all: $(addsuffix -all,$(COMMON_TARGETS)) Version -$(MAKE_TARGETS): lib-all +$(MAKE_TARGETS): lib-all libnuma-all .PHONY: include-all include-installinclude-install: $(top_builddir)/include/config.h
include/mk/config.mkinclude-allMakefile +0
-0@@ -110,7 +110,7 @@ $(sort $(addprefix$(abs_top_builddir)/,$(BOOTSTRAP_TARGETS)) $(INSTALL_DIR) $(D
## Pattern based subtarget rules.
lib-install: lib-all-$(MAKE_TARGETS) include-all lib-all:
+$(MAKE_TARGETS) include-all lib-all libnuma-all:Makefile +0
-0$(MAKE) -C "$(subst -all,,$@)" \ -f "$(abs_top_srcdir)/$(subst -all,,$@)/Makefile" alllibnuma/Makefile new file +10
-0@@ -0,0 +1,10 @@ +# + +top_srcdir ?= .. + +include $(top_srcdir)/include/mk/env_pre.mk + +LIB := libltpnuma.a + +include $(top_srcdir)/include/mk/lib.mk +include $(top_srcdir)/include/mk/generic_trunk_target.mklibnuma/tst_numa.c renamed from lib/tst_numa.c +0
-0testcases/kernel/syscalls/set_mempolicy/Makefile +2
-2@@ -2,6 +2,7 @@ top_srcdir ?= ../../../.. include $(top_srcdir)/include/mk/testcases.mk -LDLIBS += $(NUMA_LIBS) +LDFLAGS += -L$(top_builddir)/libnuma +LDLIBS += $(NUMA_LIBS) -lltpnuma include $(top_srcdir)/include/mk/generic_leaf_target.mk --2.19.2
PATCH 1/1 Fix build with libnuma-dev on some distributions
Hi,
Quoted 14 lines
----- Original Message -----
Quoted 13 lines
On some distributions when libnuma-dev is installed the tst_numa.o, which was added to libltp.a pulls in symbols from numa library to random unrealted tests which breaks the build.
This commit hence moves the
tst_numato a separate libltpnuma.a library that is used for linking only for tests that actually use it and link with -lnuma.Signed-off-by Cyril Hrubis <[email protected]>CC Jan Stancek <[email protected]>---
This should fix the build failures, beware not build tested yet.
The problem persists [1] [2]:/usr/src/ltp/testcases/kernel/syscalls/set_mempolicy/set_mempolicy04.c:105: undefined reference to numa_allocate_nodemask' /usr/src/ltp/testcases/kernel/syscalls/set_mempolicy/set_mempolicy04.c:110: undefined reference to numa_bitmask_setbit' /usr/src/ltp/testcases/kernel/syscalls/set_mempolicy/set_mempolicy04.c:112: undefined reference to `set_mempolicy'
Quoted 6 lines
I'm fine with approach. I'd suggest different directory name, but it's hard to come up with something nice. Maybe:
libnumafn, libnumautils (maybe taken), libtstnumaMight be less confusing if it doesn't share same name as existing library.
Agree.
+ other LTP libraries are hidden in some subdirectories (which might be confusing), but I like there is not lib/ and lib<foo>/ in root directory.
Kind regards,
Petr
[1] https://api.travis-ci.org/v3/job/503536791/log.txt
[2] https://travis-ci.org/pevik/ltp/jobs/503536791
PATCH 1/1 Fix build with libnuma-dev on some distributions
Hi!
Quoted 2 lines
+ other LTP libraries are hidden in some subdirectories (which might be confusing), but I like there is not
lib/and lib<foo>/ in root directory.
We can add a libs/ directory to the top level directory and put all libs shared between significant number of tests in different places there. How does this sound?
Signature · 2 lines
Cyril Hrubis [email protected]
PATCH 1/1 Fix build with libnuma-dev on some distributions
Hi,
Quoted 6 lines
Quoted 2 lines
+ other LTP libraries are hidden in some subdirectories (which might be confusing), but I like there is not
lib/and lib<foo>/ in root directory.We can add a libs/ directory to the top level directory and put all libs shared between significant number of tests in different places there. How does this sound?
Thanks, make sense to me.
Kind regards,
Petr