diff options
| author | Brent Cook <busterb@gmail.com> | 2020-08-20 09:30:21 -0500 |
|---|---|---|
| committer | Brent Cook <busterb@gmail.com> | 2020-10-04 03:50:18 -0500 |
| commit | fe42a8011b25797afa48cf0359c7e2753b2ece5f (patch) | |
| tree | 71b7ae8e5f29f90bbd7b24ac6bab81f4990b555a /tls | |
| parent | 17c88164016df821df2dff4b2b1291291ec4f28a (diff) | |
| download | portable-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 'tls')
| -rw-r--r-- | tls/Makefile.am | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tls/Makefile.am b/tls/Makefile.am index 942abf9..c4790a4 100644 --- a/tls/Makefile.am +++ b/tls/Makefile.am | |||
| @@ -7,9 +7,9 @@ EXTRA_DIST += CMakeLists.txt | |||
| 7 | EXTRA_DIST += tls.sym | 7 | EXTRA_DIST += tls.sym |
| 8 | 8 | ||
| 9 | libtls_la_LDFLAGS = -version-info @LIBTLS_VERSION@ -no-undefined -export-symbols $(top_srcdir)/tls/tls.sym | 9 | libtls_la_LDFLAGS = -version-info @LIBTLS_VERSION@ -no-undefined -export-symbols $(top_srcdir)/tls/tls.sym |
| 10 | libtls_la_LIBADD = $(abs_top_builddir)/ssl/libssl.la | 10 | libtls_la_LDFLAGS += $(abs_top_builddir)/ssl/.libs/libssl.a |
| 11 | libtls_la_LIBADD += $(abs_top_builddir)/crypto/libcrypto.la | 11 | libtls_la_LDFLAGS += $(abs_top_builddir)/crypto/.libs/libcrypto.a |
| 12 | libtls_la_LIBADD += $(PLATFORM_LDADD) | 12 | libtls_la_LIBADD = $(PLATFORM_LDADD) |
| 13 | 13 | ||
| 14 | libtls_la_CPPFLAGS = $(AM_CPPFLAGS) | 14 | libtls_la_CPPFLAGS = $(AM_CPPFLAGS) |
| 15 | if OPENSSLDIR_DEFINED | 15 | if OPENSSLDIR_DEFINED |