external/ is an old filesystem snapshot several years old. This means the openssl and crypto libraries in it are obsolettes.
Get rid of this particular crypto dependencies by using the host libraries. Signed-off-by: Benoît Canet <ben...@scylladb.com> --- modules/httpserver/Makefile | 7 +------ modules/openssl/usr.manifest | 6 +++--- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/modules/httpserver/Makefile b/modules/httpserver/Makefile index 8acdd3e0..9c42f4d0 100644 --- a/modules/httpserver/Makefile +++ b/modules/httpserver/Makefile @@ -34,12 +34,7 @@ STUB_FILES := $(addprefix obj/,$(STUB_CPP_FILES:.cc=.o)) DYN_LIBS = -lpthread -ldl -L../libtools -ltools $(boost-libs) -lyaml-cpp -ifeq ($(use_host),y) - DYN_LIBS += -lssl -lcrypto -else - DYN_LIBS += $(libs-dir)/libssl.so.10 \ - $(libs-dir)/libcrypto.so.10 -endif +DYN_LIBS += -lssl -lcrypto LIBS = $(DYN_LIBS) $(STATIC_LIBS) diff --git a/modules/openssl/usr.manifest b/modules/openssl/usr.manifest index e9d13ad3..715a0358 100644 --- a/modules/openssl/usr.manifest +++ b/modules/openssl/usr.manifest @@ -6,11 +6,11 @@ # # From openssl-libs -/usr/lib/openssl/**: %(miscbase)s/usr/lib64/openssl/** +/usr/lib/openssl/**: /usr/lib64/openssl/** #/usr/lib/&/libssl.so.1.0.1k: %(miscbase)s/usr/lib64/& -/usr/lib/&/libssl.so.10: %(miscbase)s/usr/lib64/& +/usr/lib/&/libssl.so.10: /usr/lib64/& #/usr/lib/&/libcrypto.so.1.0.1k: %(miscbase)s/usr/lib64/& -/usr/lib/&/libcrypto.so.10: %(miscbase)s/usr/lib64/& +/usr/lib/&/libcrypto.so.10: /usr/lib64/& # From libcom_err /usr/lib/&/libcom_err.so.2: %(miscbase)s/usr/lib64/& -- 2.13.3 -- 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. For more options, visit https://groups.google.com/d/optout.
