Land #610, Statically link libcrypto/ssl into libtls

author: Brent Cook <busterb@gmail.com> 2020-10-06 19:40:29 -0500
committer: Brent Cook <busterb@gmail.com> 2020-10-06 19:40:29 -0500
commit: b9918fc1ecfa74d6d3d9a3c533603a9677108d24 (patch)
tree: 9b0f7db267b0c5346996ceb55e31946862db1b69
parent: 0ef7d54fbcc9f4e51d3f56479df8d2e24bb7c5ae (diff)
parent: 5a29b0472d5d0d1aa9936e430a87299fdb0f17ba (diff)
download: portable-b9918fc1ecfa74d6d3d9a3c533603a9677108d24.tar.gz
portable-b9918fc1ecfa74d6d3d9a3c533603a9677108d24.tar.bz2
portable-b9918fc1ecfa74d6d3d9a3c533603a9677108d24.zip
6 files changed, 34 insertions, 9 deletions
diff --git a/apps/nc/Makefile.am b/apps/nc/Makefile.am
index 4b5b561..d678f1e 100644
--- a/apps/nc/Makefile.am
+++ b/apps/nc/Makefile.am
@@ -12,9 +12,9 @@ endif
 EXTRA_DIST = nc.1
 EXTRA_DIST += CMakeLists.txt
-nc_LDADD = $(abs_top_builddir)/crypto/libcrypto.la
+nc_LDFLAGS = $(abs_top_builddir)/crypto/.libs/libcrypto.a
-nc_LDADD += $(abs_top_builddir)/ssl/libssl.la
-nc_LDADD += $(abs_top_builddir)/tls/libtls.la
+nc_LDADD = $(abs_top_builddir)/tls/libtls.la
 nc_LDADD += $(PLATFORM_LDADD) $(PROG_LDADD)
 AM_CPPFLAGS += -I$(top_srcdir)/apps/nc/compat
diff --git a/configure.ac b/configure.ac
index 75b88fe..3aca617 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,8 +29,7 @@ USER_CFLAGS="$CFLAGS"
 AC_PROG_CC([cc gcc])
 AC_PROG_CC_STDC
 AM_PROG_CC_C_O
-AC_PROG_LIBTOOL
+LT_INIT([pic-only])
-LT_INIT
 CHECK_OS_OPTIONS
diff --git a/crypto/Makefile.am b/crypto/Makefile.am
index 7fcfc02..97a84e1 100644
--- a/crypto/Makefile.am
+++ b/crypto/Makefile.am
@@ -20,6 +20,7 @@ EXTRA_DIST += compat/strcasecmp.c
 BUILT_SOURCES = crypto_portable.sym
 CLEANFILES = crypto_portable.sym
+CLEANFILES += libcrypto_la_objects.mk
 crypto_portable.sym: crypto.sym  Makefile
        -echo "generating crypto_portable.sym ..."
@@ -93,8 +94,20 @@ if HOST_WIN
        -mv crypto_portable.sym.tmp crypto_portable.sym
 endif
+libcrypto_la_objects.mk: Makefile
+        @echo "libcrypto_la_objects= $(libcrypto_la_OBJECTS)" \
+          | sed 's/  */ $$\(abs_top_builddir\)\/crypto\//g' \
+          > libcrypto_la_objects.mk
+        @echo "libcompat_la_objects= $(libcompat_la_OBJECTS)" \
+          | sed 's/  */ $$\(abs_top_builddir\)\/crypto\//g' \
+          >> libcrypto_la_objects.mk
+        @echo "libcompatnoopt_la_objects= $(libcompatnoopt_la_OBJECTS)" \
+          | sed 's/  */ $$\(abs_top_builddir\)\/crypto\//g' \
+          >> libcrypto_la_objects.mk
 libcrypto_la_LDFLAGS = -version-info @LIBCRYPTO_VERSION@ -no-undefined -export-symbols crypto_portable.sym
 EXTRA_libcrypto_la_DEPENDENCIES = crypto_portable.sym
+EXTRA_libcrypto_la_DEPENDENCIES += libcrypto_la_objects.mk
 libcrypto_la_LIBADD = libcompat.la
 if !HAVE_EXPLICIT_BZERO
 libcrypto_la_LIBADD += libcompatnoopt.la
diff --git a/libtls.pc.in b/libtls.pc.in
index 82a6a71..0d4e625 100644
--- a/libtls.pc.in
+++ b/libtls.pc.in
@@ -9,8 +9,7 @@ Name: LibreSSL-libtls
 Description: Secure communications using the TLS socket protocol.
 Version: @VERSION@
 Requires:
-Requires.private: libcrypto libssl
 Conflicts:
 Libs: -L${libdir} -ltls
-Libs.private: @LIBS@ -lcrypto -lssl @PLATFORM_LDADD@
+Libs.private: @LIBS@ @PLATFORM_LDADD@
 Cflags: -I${includedir}
diff --git a/ssl/Makefile.am b/ssl/Makefile.am
index dded59f..4c4e594 100644
--- a/ssl/Makefile.am
+++ b/ssl/Makefile.am
@@ -6,6 +6,15 @@ EXTRA_DIST = VERSION
 EXTRA_DIST += CMakeLists.txt
 EXTRA_DIST += ssl.sym
+CLEANFILES = libssl_la_objects.mk
+EXTRA_libssl_la_DEPENDENCIES = libssl_la_objects.mk
+libssl_la_objects.mk: Makefile
+        @echo "libssl_la_objects= $(libssl_la_OBJECTS)" \
+          | sed 's/  */ $$\(abs_top_builddir\)\/ssl\//g' \
+          > libssl_la_objects.mk
 libssl_la_LDFLAGS = -version-info @LIBSSL_VERSION@ -no-undefined -export-symbols $(top_srcdir)/ssl/ssl.sym
 libssl_la_LIBADD = $(abs_top_builddir)/crypto/libcrypto.la $(PLATFORM_LDADD)
diff --git a/tls/Makefile.am b/tls/Makefile.am
index 942abf9..4cea3a2 100644
--- a/tls/Makefile.am
+++ b/tls/Makefile.am
@@ -1,5 +1,8 @@
 include $(top_srcdir)/Makefile.am.common
+-include $(abs_top_builddir)/crypto/libcrypto_la_objects.mk
+-include $(abs_top_builddir)/ssl/libssl_la_objects.mk
 lib_LTLIBRARIES = libtls.la
 EXTRA_DIST = VERSION
@@ -7,8 +10,10 @@ EXTRA_DIST += CMakeLists.txt
 EXTRA_DIST += tls.sym
 libtls_la_LDFLAGS = -version-info @LIBTLS_VERSION@ -no-undefined -export-symbols $(top_srcdir)/tls/tls.sym
-libtls_la_LIBADD = $(abs_top_builddir)/ssl/libssl.la
+libtls_la_LIBADD = $(libcrypto_la_objects)
-libtls_la_LIBADD += $(abs_top_builddir)/crypto/libcrypto.la
+libtls_la_LIBADD += $(libcompat_la_objects)
+libtls_la_LIBADD += $(libcompatnoopt_la_objects)
+libtls_la_LIBADD += $(libssl_la_objects)
 libtls_la_LIBADD += $(PLATFORM_LDADD)
 libtls_la_CPPFLAGS = $(AM_CPPFLAGS)
author	Brent Cook <busterb@gmail.com>	2020-10-06 19:40:29 -0500
committer	Brent Cook <busterb@gmail.com>	2020-10-06 19:40:29 -0500
commit	b9918fc1ecfa74d6d3d9a3c533603a9677108d24 (patch)
tree	9b0f7db267b0c5346996ceb55e31946862db1b69
parent	0ef7d54fbcc9f4e51d3f56479df8d2e24bb7c5ae (diff)
parent	5a29b0472d5d0d1aa9936e430a87299fdb0f17ba (diff)
download	portable-b9918fc1ecfa74d6d3d9a3c533603a9677108d24.tar.gz portable-b9918fc1ecfa74d6d3d9a3c533603a9677108d24.tar.bz2 portable-b9918fc1ecfa74d6d3d9a3c533603a9677108d24.zip

diff --git a/apps/nc/Makefile.am b/apps/nc/Makefile.am index 4b5b561..d678f1e 100644 --- a/apps/nc/Makefile.am +++ b/apps/nc/Makefile.am
@@ -12,9 +12,9 @@ endif
12	EXTRA_DIST = nc.1	12	EXTRA_DIST = nc.1
13	EXTRA_DIST += CMakeLists.txt	13	EXTRA_DIST += CMakeLists.txt
14		14
15	nc_LDADD = $(abs_top_builddir)/crypto/libcrypto.la	15	nc_LDFLAGS = $(abs_top_builddir)/crypto/.libs/libcrypto.a
16	nc_LDADD += $(abs_top_builddir)/ssl/libssl.la	16
17	nc_LDADD += $(abs_top_builddir)/tls/libtls.la	17	nc_LDADD = $(abs_top_builddir)/tls/libtls.la
18	nc_LDADD += $(PLATFORM_LDADD) $(PROG_LDADD)	18	nc_LDADD += $(PLATFORM_LDADD) $(PROG_LDADD)
19		19
20	AM_CPPFLAGS += -I$(top_srcdir)/apps/nc/compat	20	AM_CPPFLAGS += -I$(top_srcdir)/apps/nc/compat


diff --git a/configure.ac b/configure.ac index 75b88fe..3aca617 100644 --- a/configure.ac +++ b/configure.ac
@@ -29,8 +29,7 @@ USER_CFLAGS="$CFLAGS"
29	AC_PROG_CC([cc gcc])	29	AC_PROG_CC([cc gcc])
30	AC_PROG_CC_STDC	30	AC_PROG_CC_STDC
31	AM_PROG_CC_C_O	31	AM_PROG_CC_C_O
32	AC_PROG_LIBTOOL	32	LT_INIT([pic-only])
33	LT_INIT
34		33
35	CHECK_OS_OPTIONS	34	CHECK_OS_OPTIONS
36		35


diff --git a/crypto/Makefile.am b/crypto/Makefile.am index 7fcfc02..97a84e1 100644 --- a/crypto/Makefile.am +++ b/crypto/Makefile.am
@@ -20,6 +20,7 @@ EXTRA_DIST += compat/strcasecmp.c
20		20
21	BUILT_SOURCES = crypto_portable.sym	21	BUILT_SOURCES = crypto_portable.sym
22	CLEANFILES = crypto_portable.sym	22	CLEANFILES = crypto_portable.sym
		23	CLEANFILES += libcrypto_la_objects.mk
23		24
24	crypto_portable.sym: crypto.sym Makefile	25	crypto_portable.sym: crypto.sym Makefile
25	-echo "generating crypto_portable.sym ..."	26	-echo "generating crypto_portable.sym ..."
@@ -93,8 +94,20 @@ if HOST_WIN
93	-mv crypto_portable.sym.tmp crypto_portable.sym	94	-mv crypto_portable.sym.tmp crypto_portable.sym
94	endif	95	endif
95		96
		97	libcrypto_la_objects.mk: Makefile
		98	@echo "libcrypto_la_objects= $(libcrypto_la_OBJECTS)" \
		99	\| sed 's/ */ $$\(abs_top_builddir\)\/crypto\//g' \
		100	> libcrypto_la_objects.mk
		101	@echo "libcompat_la_objects= $(libcompat_la_OBJECTS)" \
		102	\| sed 's/ */ $$\(abs_top_builddir\)\/crypto\//g' \
		103	>> libcrypto_la_objects.mk
		104	@echo "libcompatnoopt_la_objects= $(libcompatnoopt_la_OBJECTS)" \
		105	\| sed 's/ */ $$\(abs_top_builddir\)\/crypto\//g' \
		106	>> libcrypto_la_objects.mk
		107
96	libcrypto_la_LDFLAGS = -version-info @LIBCRYPTO_VERSION@ -no-undefined -export-symbols crypto_portable.sym	108	libcrypto_la_LDFLAGS = -version-info @LIBCRYPTO_VERSION@ -no-undefined -export-symbols crypto_portable.sym
97	EXTRA_libcrypto_la_DEPENDENCIES = crypto_portable.sym	109	EXTRA_libcrypto_la_DEPENDENCIES = crypto_portable.sym
		110	EXTRA_libcrypto_la_DEPENDENCIES += libcrypto_la_objects.mk
98	libcrypto_la_LIBADD = libcompat.la	111	libcrypto_la_LIBADD = libcompat.la
99	if !HAVE_EXPLICIT_BZERO	112	if !HAVE_EXPLICIT_BZERO
100	libcrypto_la_LIBADD += libcompatnoopt.la	113	libcrypto_la_LIBADD += libcompatnoopt.la


diff --git a/libtls.pc.in b/libtls.pc.in index 82a6a71..0d4e625 100644 --- a/libtls.pc.in +++ b/libtls.pc.in
@@ -9,8 +9,7 @@ Name: LibreSSL-libtls
9	Description: Secure communications using the TLS socket protocol.	9	Description: Secure communications using the TLS socket protocol.
10	Version: @VERSION@	10	Version: @VERSION@
11	Requires:	11	Requires:
12	Requires.private: libcrypto libssl
13	Conflicts:	12	Conflicts:
14	Libs: -L${libdir} -ltls	13	Libs: -L${libdir} -ltls
15	Libs.private: @LIBS@ -lcrypto -lssl @PLATFORM_LDADD@	14	Libs.private: @LIBS@ @PLATFORM_LDADD@
16	Cflags: -I${includedir}	15	Cflags: -I${includedir}


diff --git a/ssl/Makefile.am b/ssl/Makefile.am index dded59f..4c4e594 100644 --- a/ssl/Makefile.am +++ b/ssl/Makefile.am
@@ -6,6 +6,15 @@ EXTRA_DIST = VERSION
6	EXTRA_DIST += CMakeLists.txt	6	EXTRA_DIST += CMakeLists.txt
7	EXTRA_DIST += ssl.sym	7	EXTRA_DIST += ssl.sym
8		8
		9	CLEANFILES = libssl_la_objects.mk
		10
		11	EXTRA_libssl_la_DEPENDENCIES = libssl_la_objects.mk
		12
		13	libssl_la_objects.mk: Makefile
		14	@echo "libssl_la_objects= $(libssl_la_OBJECTS)" \
		15	\| sed 's/ */ $$\(abs_top_builddir\)\/ssl\//g' \
		16	> libssl_la_objects.mk
		17
9	libssl_la_LDFLAGS = -version-info @LIBSSL_VERSION@ -no-undefined -export-symbols $(top_srcdir)/ssl/ssl.sym	18	libssl_la_LDFLAGS = -version-info @LIBSSL_VERSION@ -no-undefined -export-symbols $(top_srcdir)/ssl/ssl.sym
10	libssl_la_LIBADD = $(abs_top_builddir)/crypto/libcrypto.la $(PLATFORM_LDADD)	19	libssl_la_LIBADD = $(abs_top_builddir)/crypto/libcrypto.la $(PLATFORM_LDADD)
11		20


diff --git a/tls/Makefile.am b/tls/Makefile.am index 942abf9..4cea3a2 100644 --- a/tls/Makefile.am +++ b/tls/Makefile.am
@@ -1,5 +1,8 @@
1	include $(top_srcdir)/Makefile.am.common	1	include $(top_srcdir)/Makefile.am.common
2		2
		3	-include $(abs_top_builddir)/crypto/libcrypto_la_objects.mk
		4	-include $(abs_top_builddir)/ssl/libssl_la_objects.mk
		5
3	lib_LTLIBRARIES = libtls.la	6	lib_LTLIBRARIES = libtls.la
4		7
5	EXTRA_DIST = VERSION	8	EXTRA_DIST = VERSION
@@ -7,8 +10,10 @@ EXTRA_DIST += CMakeLists.txt
7	EXTRA_DIST += tls.sym	10	EXTRA_DIST += tls.sym
8		11
9	libtls_la_LDFLAGS = -version-info @LIBTLS_VERSION@ -no-undefined -export-symbols $(top_srcdir)/tls/tls.sym	12	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	13	libtls_la_LIBADD = $(libcrypto_la_objects)
11	libtls_la_LIBADD += $(abs_top_builddir)/crypto/libcrypto.la	14	libtls_la_LIBADD += $(libcompat_la_objects)
		15	libtls_la_LIBADD += $(libcompatnoopt_la_objects)
		16	libtls_la_LIBADD += $(libssl_la_objects)
12	libtls_la_LIBADD += $(PLATFORM_LDADD)	17	libtls_la_LIBADD += $(PLATFORM_LDADD)
13		18
14	libtls_la_CPPFLAGS = $(AM_CPPFLAGS)	19	libtls_la_CPPFLAGS = $(AM_CPPFLAGS)