generic-library/libreSSL
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add platform libraries to libcompat's LIBADD list

Browse Source 
ok beck@
This commit is contained in:
Brent Cook 2014-07-12 03:34:08 -05:00
parent 6017202b77
commit 65944782c3
8 changed files with 66 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -34,6 +34,8 @@ Makefile.in
*.lo
*.la
*.pc
# tests
test-driver
*.log

3
Makefile.am
View File

@ -1,2 +1,5 @@
SUBDIRS = crypto ssl include apps tests man
ACLOCAL_AMFLAGS = -I m4
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libcrypto.pc libssl.pc openssl.pc

19
configure.ac.tpl
View File

@ -97,5 +97,20 @@ AC_CHECK_HEADER(sys/sysctl.h, AC_DEFINE(HAVE_SYS_SYSCTL_H))
LT_INIT
AC_OUTPUT(Makefile include/Makefile include/openssl/Makefile ssl/Makefile
crypto/Makefile tests/Makefile apps/Makefile man/Makefile)
AC_CONFIG_FILES([
Makefile
include/Makefile
include/openssl/Makefile
ssl/Makefile
crypto/Makefile
tests/Makefile
apps/Makefile
man/Makefile
libcrypto.pc
libssl.pc
openssl.pc
])
AC_OUTPUT
DISTCLEANFILES += *.pc

1
crypto/Makefile.am.tpl
View File

@ -19,6 +19,7 @@ libcompatnoopt_la_SOURCES = compat/explicit_bzero.c
# other compatibility functions
libcompat_la_CFLAGS = $(CFLAGS) $(USER_CFLAGS)
libcompat_la_SOURCES =
libcompat_la_LIBADD = $(PLATFORM_LDADD)
if NO_STRLCAT
libcompat_la_SOURCES += compat/strlcat.c

15
libcrypto.pc.in Normal file
View File

@ -0,0 +1,15 @@
#libcrypto pkg-config source file
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
Name: LibreSSL-libssl
Description: Secure Sockets Layer and cryptography libraries
Version: @VERSION@
Requires:
Conflicts:
Libs: -L${libdir} -lcrypto
Libs.private: @LIBS@
Cflags: -I${includedir}

16
libssl.pc.in Normal file
View File

@ -0,0 +1,16 @@
#libssl pkg-config source file
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
Name: LibreSSL-libssl
Description: Secure Sockets Layer and cryptography libraries
Version: @VERSION@
Requires:
Requires.private: libcrypto
Conflicts:
Libs: -L${libdir} -lssl
Libs.private: @LIBS@ -lcrypto
Cflags: -I${includedir}

11
openssl.pc.in Normal file
View File

@ -0,0 +1,11 @@
#openssl pkg-config source file
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
Name: LibreSSL
Description: Secure Sockets Layer and cryptography libraries and tools
Version: @VERSION@
Requires: libssl libcrypto

3
update.sh
View File

@ -306,8 +306,7 @@ test_excludes=(biotest aeadtest evptest pq_test ssltest arc4randomforktest)
fi
echo "check_PROGRAMS += $TEST" >> Makefile.am
echo "${TEST}_SOURCES = $i" >> Makefile.am
echo "${TEST}_LDADD = \$(PLATFORM_LDADD)" >> Makefile.am
echo "${TEST}_LDADD += \$(top_builddir)/ssl/libssl.la" >> Makefile.am
echo "${TEST}_LDADD = \$(top_builddir)/ssl/libssl.la" >> Makefile.am
echo "${TEST}_LDADD += \$(top_builddir)/crypto/libcrypto.la" >> Makefile.am
done
)