libboost_program_options caused us a various problems such as
differences in visibility between versions (issue #1040),
significant code size (issue #980) and others, so in the
previous patches we removed all its uses in OSv and its
small utility applications (like cpiod and httpserver).
Now that it's no longer used, we can stop compiling it into
the kernel, or pretending (in elf.cc) that it is included
in the kernel.
Signed-off-by: Nadav Har'El <n...@scylladb.com>
---
core/elf.cc | 2 --
Makefile | 3 +--
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/core/elf.cc b/core/elf.cc
index af4f2d0d..1f8ae404 100644
--- a/core/elf.cc
+++ b/core/elf.cc
@@ -1154,12 +1154,10 @@ program::program(void* addr)
#ifdef __x86_64__
"ld-linux-x86-64.so.2",
"libboost_system.so.1.55.0",
- "libboost_program_options.so.1.55.0",
#endif /* __x86_64__ */
#ifdef __aarch64__
"ld-linux-aarch64.so.1",
"libboost_system-mt.so.1.55.0",
- "libboost_program_options-mt.so.1.55.0",
#endif /* __aarch64__ */
"libpthread.so.0",
"libdl.so.2",
diff --git a/Makefile b/Makefile
index 348e3747..ede17c68 100644
--- a/Makefile
+++ b/Makefile
@@ -1862,8 +1862,7 @@ else
boost-includes = -isystem $(miscbase)/usr/include
endif
-boost-libs := $(boost-lib-dir)/libboost_program_options$(boost-mt).a \
- $(boost-lib-dir)/libboost_system$(boost-mt).a
+boost-libs := $(boost-lib-dir)/libboost_system$(boost-mt).a
ifeq ($(nfs), true)
nfs-lib = $(out)/libnfs.a
--
2.20.1
--
You received this message because you are subscribed to the Google Groups "OSv
Development" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to osv-dev+unsubscr...@googlegroups.com.
To view this discussion on the web visit
https://groups.google.com/d/msgid/osv-dev/20191003093134.16044-1-nyh%40scylladb.com.
