| Message ID | 1591083478-5342-1-git-send-email-xuyang2018.jy@cn.fujitsu.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v2] LIB: Use INTERNAL_LIB for ltp lib | expand |
Hi Xu, Reviewed-by: Petr Vorel <pvorel@suse.cz> Cyril concerned 3rd party use of lib/libltp.a, but nobody complained. Given Jan acked v1, I'd be also for merge. > Use INTERNAL_LIB for ltp lib because installing these ltp static > library in any situation is meaningless. > all static library as below: > ./libs/libltpuinput/libltpuinput.a > ./libs/libltpnewipc/libltpnewipc.a > ./libs/libltpnuma/libltpnuma.a > ./libs/libltpipc/libltpipc.a > ./libs/libltpipc/libltpmsgctl.a > ./utils/sctp/lib/libsctp.a > ./utils/sctp/testlib/libsctputil.a > ./lib/libltp.a > ./testcases/network/rpc/basic_tests/rpc01/lib/librpc01.a > ./testcases/network/rpc/rpc-tirpc/tests_pack/lib/librpc-tirpc.a > ./testcases/kernel/containers/libclone/libclone.a > ./testcases/kernel/mem/hugetlb/lib/libhugetlb.a > ./testcases/kernel/mem/lib/libmem.a > ./testcases/kernel/controllers/libcontrollers/libcontrollers.a > ./testcases/kernel/controllers/cpuset/cpuset_lib/libcpu_set.a > ./testcases/kernel/lib/libkerntest.a nit: I'd remove './' from commit message. Kind regards, Petr > Also include Android_libpthread and android_librt and remove useless > libdir variable. > Signed-off-by: Yang Xu <xuyang2018.jy@cn.fujitsu.com> > --- > v1->v2: > 1.remove ./testcases/commands/nm/datafiles/lib.a from commit message > 2.add two anroid Makefiles > 3.remove useless libdir FYI I'm still having in my mind trying dynamic library linking. But if I ever do it I'll just re-add this variable. Kind regards, Petr
Hi Petr > Hi Xu, > > Reviewed-by: Petr Vorel <pvorel@suse.cz> > > Cyril concerned 3rd party use of lib/libltp.a, but nobody complained. > Given Jan acked v1, I'd be also for merge. > We also should include android_libpthread and android_librt Makefile. >> Use INTERNAL_LIB for ltp lib because installing these ltp static >> library in any situation is meaningless. > >> all static library as below: >> ./libs/libltpuinput/libltpuinput.a >> ./libs/libltpnewipc/libltpnewipc.a >> ./libs/libltpnuma/libltpnuma.a >> ./libs/libltpipc/libltpipc.a >> ./libs/libltpipc/libltpmsgctl.a >> ./utils/sctp/lib/libsctp.a >> ./utils/sctp/testlib/libsctputil.a >> ./lib/libltp.a >> ./testcases/network/rpc/basic_tests/rpc01/lib/librpc01.a >> ./testcases/network/rpc/rpc-tirpc/tests_pack/lib/librpc-tirpc.a >> ./testcases/kernel/containers/libclone/libclone.a >> ./testcases/kernel/mem/hugetlb/lib/libhugetlb.a >> ./testcases/kernel/mem/lib/libmem.a >> ./testcases/kernel/controllers/libcontrollers/libcontrollers.a >> ./testcases/kernel/controllers/cpuset/cpuset_lib/libcpu_set.a >> ./testcases/kernel/lib/libkerntest.a > nit: I'd remove './' from commit message. > > Kind regards, > Petr > >> Also include Android_libpthread and android_librt and remove useless >> libdir variable. > >> Signed-off-by: Yang Xu <xuyang2018.jy@cn.fujitsu.com> >> --- >> v1->v2: >> 1.remove ./testcases/commands/nm/datafiles/lib.a from commit message >> 2.add two anroid Makefiles >> 3.remove useless libdir > FYI I'm still having in my mind trying dynamic library linking. > But if I ever do it I'll just re-add this variable. Yes, for now, this variable is meaningless unless using dynamic libraries. Best Regards Yang Xu > > Kind regards, > Petr > >
Hi Xu, > > Cyril concerned 3rd party use of lib/libltp.a, but nobody complained. > > Given Jan acked v1, I'd be also for merge. > We also should include android_libpthread and android_librt Makefile. Not sure what you mean. You did the change in android_libpthread and android_librt Makefile (this is v2 thread), thus I consider this patch ready. Or am I missing something? Kind regards, Petr
diff --git a/include/mk/config.mk.in b/include/mk/config.mk.in index 427608a17..f7b26cbd5 100644 --- a/include/mk/config.mk.in +++ b/include/mk/config.mk.in @@ -52,7 +52,6 @@ datarootdir := @datarootdir@ includedir := @includedir@ exec_prefix := @exec_prefix@ bindir := @bindir@ -libdir := @libdir@ mandir := @mandir@ CPPFLAGS := @CPPFLAGS@ @@ -82,4 +81,4 @@ ifeq ($(strip $(prefix)),) $(error you are using $$(prefix) incorrectly -- set it to $(abs_top_srcdir) if you want to build in the source tree) endif -export datarootdir includedir libdir mandir prefix +export datarootdir includedir mandir prefix diff --git a/include/mk/generic_leaf_target.inc b/include/mk/generic_leaf_target.inc index dd54d05e9..ca61ceff4 100644 --- a/include/mk/generic_leaf_target.inc +++ b/include/mk/generic_leaf_target.inc @@ -83,12 +83,6 @@ # # INSTALL_DIR := /path/to/installdir/from/$(DESTDIR) # -# e.g. if I wanted to install my binaries in $(libdir) (which may not exist -# outside of $(prefix) right now, but could in the future), I could do the -# following: -# -# INSTALL_DIR := $(libdir) -# .PHONY: all clean install diff --git a/include/mk/lib.mk b/include/mk/lib.mk index 36e1ba17b..9d018718b 100644 --- a/include/mk/lib.mk +++ b/include/mk/lib.mk @@ -26,8 +26,6 @@ include $(top_srcdir)/include/mk/env_pre.mk -INSTALL_DIR := $(libdir) - # An extension of generic_leaf_target, strictly for libraries. .PHONY: install_headers diff --git a/lib/Makefile b/lib/Makefile index e7fc753da..f019432e8 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -32,7 +32,7 @@ else FILTER_OUT_LIBSRCS += tlibio.c tst_safe_sysv_ipc.c endif -LIB := libltp.a +INTERNAL_LIB := libltp.a pc_file := $(DESTDIR)/$(datarootdir)/pkgconfig/ltp.pc diff --git a/lib/android_libpthread/Makefile b/lib/android_libpthread/Makefile index 2946d093f..441cadcb9 100644 --- a/lib/android_libpthread/Makefile +++ b/lib/android_libpthread/Makefile @@ -2,6 +2,6 @@ top_srcdir ?= ../.. include $(top_srcdir)/include/mk/env_pre.mk -LIB := libpthread.a +INTERNAL_LIB := libpthread.a include $(top_srcdir)/include/mk/lib.mk diff --git a/lib/android_librt/Makefile b/lib/android_librt/Makefile index ecb1fbe6c..70d520c0a 100644 --- a/lib/android_librt/Makefile +++ b/lib/android_librt/Makefile @@ -2,6 +2,6 @@ top_srcdir ?= ../.. include $(top_srcdir)/include/mk/env_pre.mk -LIB := librt.a +INTERNAL_LIB := librt.a include $(top_srcdir)/include/mk/lib.mk diff --git a/libs/libltpipc/Makefile b/libs/libltpipc/Makefile index 11f38ea0a..fadd04833 100644 --- a/libs/libltpipc/Makefile +++ b/libs/libltpipc/Makefile @@ -5,7 +5,7 @@ top_srcdir ?= ../.. include $(top_srcdir)/include/mk/env_pre.mk -LIB := libltpipc.a libltpmsgctl.a +INTERNAL_LIB := libltpipc.a libltpmsgctl.a include $(top_srcdir)/include/mk/lib.mk include $(top_srcdir)/include/mk/generic_leaf_target.mk diff --git a/libs/libltpnuma/Makefile b/libs/libltpnuma/Makefile index 56d6b7762..a6856758d 100644 --- a/libs/libltpnuma/Makefile +++ b/libs/libltpnuma/Makefile @@ -6,7 +6,7 @@ top_srcdir ?= ../.. include $(top_srcdir)/include/mk/env_pre.mk -LIB := libltpnuma.a +INTERNAL_LIB := libltpnuma.a include $(top_srcdir)/include/mk/lib.mk include $(top_srcdir)/include/mk/generic_leaf_target.mk diff --git a/libs/libltpuinput/Makefile b/libs/libltpuinput/Makefile index dd2a6c096..c72dd2e1e 100644 --- a/libs/libltpuinput/Makefile +++ b/libs/libltpuinput/Makefile @@ -6,7 +6,7 @@ top_srcdir ?= ../.. include $(top_srcdir)/include/mk/env_pre.mk -LIB := libltpuinput.a +INTERNAL_LIB := libltpuinput.a include $(top_srcdir)/include/mk/lib.mk include $(top_srcdir)/include/mk/generic_leaf_target.mk diff --git a/testcases/kernel/containers/libclone/Makefile b/testcases/kernel/containers/libclone/Makefile index d78570db7..13af52b67 100644 --- a/testcases/kernel/containers/libclone/Makefile +++ b/testcases/kernel/containers/libclone/Makefile @@ -22,6 +22,6 @@ top_srcdir ?= ../../../.. include $(top_srcdir)/include/mk/testcases.mk -LIB := libclone.a +INTERNAL_LIB := libclone.a include $(top_srcdir)/include/mk/lib.mk diff --git a/testcases/kernel/controllers/cpuset/cpuset_lib/Makefile b/testcases/kernel/controllers/cpuset/cpuset_lib/Makefile index 069ebc38c..1b6a40bea 100644 --- a/testcases/kernel/controllers/cpuset/cpuset_lib/Makefile +++ b/testcases/kernel/controllers/cpuset/cpuset_lib/Makefile @@ -27,6 +27,6 @@ include $(top_srcdir)/include/mk/testcases.mk LDLIBS := -lm -lcontrollers -lltp $(LDLIBS) -LIB := libcpu_set.a +INTERNAL_LIB := libcpu_set.a include $(top_srcdir)/include/mk/lib.mk diff --git a/testcases/kernel/controllers/libcontrollers/Makefile b/testcases/kernel/controllers/libcontrollers/Makefile index 88918cf2d..9f8955e28 100644 --- a/testcases/kernel/controllers/libcontrollers/Makefile +++ b/testcases/kernel/controllers/libcontrollers/Makefile @@ -24,6 +24,6 @@ top_srcdir ?= ../../../.. include $(top_srcdir)/include/mk/testcases.mk -LIB := libcontrollers.a +INTERNAL_LIB := libcontrollers.a include $(top_srcdir)/include/mk/lib.mk diff --git a/testcases/kernel/mem/hugetlb/lib/Makefile b/testcases/kernel/mem/hugetlb/lib/Makefile index c5c55648f..2e893429d 100644 --- a/testcases/kernel/mem/hugetlb/lib/Makefile +++ b/testcases/kernel/mem/hugetlb/lib/Makefile @@ -21,6 +21,6 @@ top_srcdir ?= ../../../../.. include $(top_srcdir)/include/mk/env_pre.mk include $(top_srcdir)/testcases/kernel/mem/include/libmem.mk -LIB := libhugetlb.a +INTERNAL_LIB := libhugetlb.a include $(top_srcdir)/include/mk/lib.mk diff --git a/testcases/network/rpc/rpc-tirpc/tests_pack/lib/Makefile b/testcases/network/rpc/rpc-tirpc/tests_pack/lib/Makefile index 3563d2dc5..5a6f5d41c 100644 --- a/testcases/network/rpc/rpc-tirpc/tests_pack/lib/Makefile +++ b/testcases/network/rpc/rpc-tirpc/tests_pack/lib/Makefile @@ -20,6 +20,6 @@ top_srcdir ?= ../../../../../.. include $(top_srcdir)/include/mk/env_pre.mk -LIB := librpc-tirpc.a +INTERNAL_LIB := librpc-tirpc.a include $(top_srcdir)/include/mk/lib.mk diff --git a/utils/sctp/lib/Makefile b/utils/sctp/lib/Makefile index c0cb35b4e..54438b61c 100644 --- a/utils/sctp/lib/Makefile +++ b/utils/sctp/lib/Makefile @@ -26,6 +26,6 @@ include $(top_srcdir)/include/mk/env_pre.mk CPPFLAGS += -I$(abs_srcdir)/../include -LIB := libsctp.a +INTERNAL_LIB := libsctp.a include $(top_srcdir)/include/mk/lib.mk diff --git a/utils/sctp/testlib/Makefile b/utils/sctp/testlib/Makefile index 2977f45b3..84ed02040 100644 --- a/utils/sctp/testlib/Makefile +++ b/utils/sctp/testlib/Makefile @@ -28,7 +28,7 @@ CPPFLAGS += -DLTP -I$(abs_srcdir)/../include LDLIBS += -lltp -lsctp -LIB := libsctputil.a +INTERNAL_LIB := libsctputil.a # #DEPLIBDIR := ../lib
Use INTERNAL_LIB for ltp lib because installing these ltp static library in any situation is meaningless. all static library as below: ./libs/libltpuinput/libltpuinput.a ./libs/libltpnewipc/libltpnewipc.a ./libs/libltpnuma/libltpnuma.a ./libs/libltpipc/libltpipc.a ./libs/libltpipc/libltpmsgctl.a ./utils/sctp/lib/libsctp.a ./utils/sctp/testlib/libsctputil.a ./lib/libltp.a ./testcases/network/rpc/basic_tests/rpc01/lib/librpc01.a ./testcases/network/rpc/rpc-tirpc/tests_pack/lib/librpc-tirpc.a ./testcases/kernel/containers/libclone/libclone.a ./testcases/kernel/mem/hugetlb/lib/libhugetlb.a ./testcases/kernel/mem/lib/libmem.a ./testcases/kernel/controllers/libcontrollers/libcontrollers.a ./testcases/kernel/controllers/cpuset/cpuset_lib/libcpu_set.a ./testcases/kernel/lib/libkerntest.a Also include Android_libpthread and android_librt and remove useless libdir variable. Signed-off-by: Yang Xu <xuyang2018.jy@cn.fujitsu.com> --- v1->v2: 1.remove ./testcases/commands/nm/datafiles/lib.a from commit message 2.add two anroid Makefiles 3.remove useless libdir include/mk/config.mk.in | 3 +-- include/mk/generic_leaf_target.inc | 6 ------ include/mk/lib.mk | 2 -- lib/Makefile | 2 +- lib/android_libpthread/Makefile | 2 +- lib/android_librt/Makefile | 2 +- libs/libltpipc/Makefile | 2 +- libs/libltpnuma/Makefile | 2 +- libs/libltpuinput/Makefile | 2 +- testcases/kernel/containers/libclone/Makefile | 2 +- testcases/kernel/controllers/cpuset/cpuset_lib/Makefile | 2 +- testcases/kernel/controllers/libcontrollers/Makefile | 2 +- testcases/kernel/mem/hugetlb/lib/Makefile | 2 +- testcases/network/rpc/rpc-tirpc/tests_pack/lib/Makefile | 2 +- utils/sctp/lib/Makefile | 2 +- utils/sctp/testlib/Makefile | 2 +- 16 files changed, 14 insertions(+), 23 deletions(-)