aboutsummaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorBrent Cook <busterb@gmail.com>2020-08-20 09:30:21 -0500
committerBrent Cook <busterb@gmail.com>2020-10-04 03:50:18 -0500
commitfe42a8011b25797afa48cf0359c7e2753b2ece5f (patch)
tree71b7ae8e5f29f90bbd7b24ac6bab81f4990b555a /apps
parent17c88164016df821df2dff4b2b1291291ec4f28a (diff)
downloadportable-fe42a8011b25797afa48cf0359c7e2753b2ece5f.tar.gz
portable-fe42a8011b25797afa48cf0359c7e2753b2ece5f.tar.bz2
portable-fe42a8011b25797afa48cf0359c7e2753b2ece5f.zip
Configure libtls and nc(1) to statically link to libcrypto/ssl
An issue that Reyk Floeter noted while building a Debian package for LibreSSL is that installing libtls along with OpenSSL causes linker issues since it will often pick up the wrong libcrypto/libssl. This change makes libtls statically link the object files it needs rather than relying on the shared libraries, effectively making libtls self-contained and able to be packaged independently. This should make it possible for other projects that also use libtls to be able to package support without requiring the target OS to ship libcrypto / libssl from LibreSSL. https://salsa.debian.org/reyk-guest/libressl/-/commit/678278df55ce866f2f363998ca690442fa786c66
Diffstat (limited to 'apps')
-rw-r--r--apps/nc/Makefile.am6
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/nc/Makefile.am b/apps/nc/Makefile.am
index 4b5b561..135ff4b 100644
--- a/apps/nc/Makefile.am
+++ b/apps/nc/Makefile.am
@@ -12,9 +12,9 @@ endif
12EXTRA_DIST = nc.1 12EXTRA_DIST = nc.1
13EXTRA_DIST += CMakeLists.txt 13EXTRA_DIST += CMakeLists.txt
14 14
15nc_LDADD = $(abs_top_builddir)/crypto/libcrypto.la 15nc_LDFLAGS = $(abs_top_builddir)/crypto/.libs/libcompat.a
16nc_LDADD += $(abs_top_builddir)/ssl/libssl.la 16
17nc_LDADD += $(abs_top_builddir)/tls/libtls.la 17nc_LDADD = $(abs_top_builddir)/tls/libtls.la
18nc_LDADD += $(PLATFORM_LDADD) $(PROG_LDADD) 18nc_LDADD += $(PLATFORM_LDADD) $(PROG_LDADD)
19 19
20AM_CPPFLAGS += -I$(top_srcdir)/apps/nc/compat 20AM_CPPFLAGS += -I$(top_srcdir)/apps/nc/compat