LIB: Use INTERNAL_LIB for ltp lib
PATCH v2 1/1 LIB: Use INTERNAL_LIB for ltp 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.
---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(-)
include/mk/config.mk.in +1 -2
@@ -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
include/mk/generic_leaf_target.inc +0 -6
@@ -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
include/mk/lib.mk +0 -2
@@ -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
lib/Makefile +1 -1
@@ -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
lib/android_libpthread/Makefile +1 -1
@@ -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
lib/android_librt/Makefile +1 -1
@@ -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
libs/libltpipc/Makefile +1 -1
@@ -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
libs/libltpnuma/Makefile +1 -1
@@ -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
libs/libltpuinput/Makefile +1 -1
@@ -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
testcases/kernel/containers/libclone/Makefile +1 -1
@@ -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
testcases/kernel/controllers/cpuset/cpuset_lib/Makefile +1 -1
@@ -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
testcases/kernel/controllers/libcontrollers/Makefile +1 -1
@@ -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
testcases/kernel/mem/hugetlb/lib/Makefile +1 -1
@@ -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
testcases/network/rpc/rpc-tirpc/tests_pack/lib/Makefile +1 -1
@@ -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
utils/sctp/lib/Makefile +1 -1
@@ -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
utils/sctp/testlib/Makefile +1 -1
@@ -28,7 +28,7 @@ CPPFLAGS += -DLTP -I$(abs_srcdir)/../include LDLIBS += -lltp -lsctp -LIB := libsctputil.a +INTERNAL_LIB := libsctputil.a # #DEPLIBDIR := ../lib
Signature · 1 line
2.23.0
PATCH v2 1/1 LIB: Use INTERNAL_LIB for ltp lib
Hi Xu,
Cyril concerned 3rd party use of lib/libltp.a, but nobody complained. Given Jan acked v1, I'd be also for merge.
Quoted 12 lines
Use
INTERNAL_LIBfor 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
Quoted 8 lines
./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
Quoted 9 lines
Also include
Android_libpthreadandandroid_librtand remove useless libdir variable.Signed-off-by Yang Xu <[email protected]>---
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
PATCH v2 1/1 LIB: Use INTERNAL_LIB for ltp lib
Hi Petr
Quoted 7 lines
Hi Xu,
Reviewed-by Petr Vorel <[email protected]>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.
Quoted 28 lines
Quoted 12 lines
Use
INTERNAL_LIBfor 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.aQuoted 8 lines
./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,
PetrQuoted 2 lines
Also include
Android_libpthreadandandroid_librtand remove useless libdir variable.
Quoted 8 lines
Quoted 6 lines
Signed-off-by Yang Xu <[email protected]>---
v1->v2:
1.remove ./testcases/commands/nm/datafiles/lib.a from commit message 2.add two anroid Makefiles
3.remove useless libdirFYI 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
Quoted 5 lines
Kind regards,
Petr
PATCH v2 1/1 LIB: Use INTERNAL_LIB for ltp lib
Hi Xu,
Quoted 4 lines
Quoted 2 lines
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_libpthreadandandroid_librtMakefile.
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