factotum/libressl-portable
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Build a static test library with all symbols

Browse Source 
Build and link a special test library rather than assuming that the
build has static libraries available.
This commit is contained in:
Brent Cook 2022-12-13 04:34:25 -06:00
parent 5a590f8e0c
commit 4f0f6ebd1a
3 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tests/Makefile.am
View File

@ -1,5 +1,9 @@
include $(top_srcdir)/Makefile.am.common include $(top_srcdir)/Makefile.am.common
-include $(abs_top_builddir)/crypto/libcrypto_la_objects.mk
-include $(abs_top_builddir)/ssl/libssl_la_objects.mk
-include $(abs_top_builddir)/tls/libtls_la_objects.mk
AM_CPPFLAGS += -DLIBRESSL_CRYPTO_INTERNAL AM_CPPFLAGS += -DLIBRESSL_CRYPTO_INTERNAL
AM_CPPFLAGS += -I $(top_srcdir)/crypto/asn1 AM_CPPFLAGS += -I $(top_srcdir)/crypto/asn1
@ -14,13 +18,15 @@ AM_CPPFLAGS += -I $(top_srcdir)/apps/openssl
AM_CPPFLAGS += -I $(top_srcdir)/apps/openssl/compat AM_CPPFLAGS += -I $(top_srcdir)/apps/openssl/compat
AM_CPPFLAGS += -D_PATH_SSL_CA_FILE=\"$(top_srcdir)/cert.pem\" AM_CPPFLAGS += -D_PATH_SSL_CA_FILE=\"$(top_srcdir)/cert.pem\"
LDADD = $(abs_top_builddir)/tls/.libs/libtls.a noinst_LTLIBRARIES = libtest.la
LDADD += $(abs_top_builddir)/ssl/.libs/libssl.a libtest_la_LIBADD = $(libcrypto_la_objects)
LDADD += $(abs_top_builddir)/crypto/.libs/libcrypto.a libtest_la_LIBADD += $(libcompat_la_objects)
LDADD += $(PLATFORM_LDADD) $(PROG_LDADD) libtest_la_LIBADD += $(libcompatnoopt_la_objects)
if HOST_ASM_MACOSX_X86_64 libtest_la_LIBADD += $(libssl_la_objects)
LDADD += $(abs_top_builddir)/crypto/.libs/libcrypto_la-cpuid-macosx-x86_64.o libtest_la_LIBADD += $(libtls_la_objects)
endif libtest_la_SOURCES = empty.c
LDADD = libtest.la $(PLATFORM_LDADD) $(PROG_LDADD)
TEST_LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/tap-driver.sh TEST_LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/tap-driver.sh

9
tls/Makefile.am
View File

@ -9,6 +9,15 @@ EXTRA_DIST = VERSION
EXTRA_DIST += CMakeLists.txt EXTRA_DIST += CMakeLists.txt
EXTRA_DIST += tls.sym EXTRA_DIST += tls.sym
CLEANFILES = libtls_la_objects.mk
EXTRA_libtls_la_DEPENDENCIES = libtls_la_objects.mk
libtls_la_objects.mk: Makefile
@echo "libtls_la_objects= $(libtls_la_OBJECTS)" \
| sed 's/ */ $$\(abs_top_builddir\)\/tls\//g' \
> libtls_la_objects.mk
libtls_la_LDFLAGS = -version-info @LIBTLS_VERSION@ -no-undefined -export-symbols $(top_srcdir)/tls/tls.sym libtls_la_LDFLAGS = -version-info @LIBTLS_VERSION@ -no-undefined -export-symbols $(top_srcdir)/tls/tls.sym
libtls_la_LIBADD = $(libcrypto_la_objects) libtls_la_LIBADD = $(libcrypto_la_objects)
libtls_la_LIBADD += $(libcompat_la_objects) libtls_la_LIBADD += $(libcompat_la_objects)

1
update.sh
View File

@ -286,6 +286,7 @@ $GREP '^[A-Za-z0-9_]' < $libssl_src/Symbols.list > ssl/ssl.sym
# copy libcrypto tests # copy libcrypto tests
echo "copying tests" echo "copying tests"
touch tests/empty.c
for i in `find $libcrypto_regress -name '*.c'`; do for i in `find $libcrypto_regress -name '*.c'`; do
$CP "$i" tests $CP "$i" tests
done done