mirror of
https://github.com/MariaDB/server.git
synced 2026-05-06 15:15:34 +02:00
Bug #15168 yassl failure on amd64
- Use libtool to build libraries config/ac-macros/yassl.m4: If necessary, disable inlining for all files in libtaocrypt not only integer.cpp Remove ver yassl_libs_with_path, not used anymore extra/yassl/src/Makefile.am: Let libtool build libraries extra/yassl/taocrypt/src/Makefile.am: Let libtool build libraries Only build one lib libmysqld/Makefile.am: Dont include yassl libs in libmysqld libmysqld/examples/Makefile.am: Add yassl includes and libs when linking examples with libmysqld
This commit is contained in:
parent
60f3487405
commit
a101950d7b
5 changed files with 13 additions and 20 deletions
|
|
@ -1,7 +1,7 @@
|
|||
INCLUDES = -I../include -I../taocrypt/include -I../mySTL
|
||||
|
||||
noinst_LIBRARIES = libyassl.a
|
||||
libyassl_a_SOURCES = buffer.cpp cert_wrapper.cpp crypto_wrapper.cpp \
|
||||
noinst_LTLIBRARIES = libyassl.la
|
||||
libyassl_la_SOURCES = buffer.cpp cert_wrapper.cpp crypto_wrapper.cpp \
|
||||
handshake.cpp lock.cpp log.cpp socket_wrapper.cpp ssl.cpp \
|
||||
template_instnt.cpp timer.cpp yassl_imp.cpp yassl_error.cpp yassl_int.cpp
|
||||
EXTRA_DIST = $(wildcard ../include/*.hpp) $(wildcard ../include/openssl/*.h)
|
||||
|
|
|
|||
|
|
@ -1,15 +1,11 @@
|
|||
INCLUDES = -I../include -I../../mySTL
|
||||
|
||||
noinst_LIBRARIES = libtaoint.a libtaocrypt.a
|
||||
noinst_LTLIBRARIES = libtaocrypt.la
|
||||
|
||||
libtaoint_a_SOURCES = integer.cpp
|
||||
libtaoint_a_CXXFLAGS = @yassl_integer_extra_cxxflags@
|
||||
|
||||
libtaocrypt_a_SOURCES = aes.cpp aestables.cpp algebra.cpp arc4.cpp asn.cpp \
|
||||
libtaocrypt_la_SOURCES = aes.cpp aestables.cpp algebra.cpp arc4.cpp asn.cpp \
|
||||
coding.cpp dh.cpp des.cpp dsa.cpp file.cpp hash.cpp \
|
||||
md2.cpp md5.cpp misc.cpp random.cpp ripemd.cpp rsa.cpp sha.cpp \
|
||||
template_instnt.cpp
|
||||
libtaocrypt_a_LIBADD = libtaoint_a-integer.o
|
||||
template_instnt.cpp integer.cpp
|
||||
libtaocrypt_la_CXXFLAGS = @yassl_taocrypt_extra_cxxflags@ -DYASSL_PURE_C
|
||||
|
||||
EXTRA_DIST = $(wildcard ../include/*.hpp)
|
||||
AM_CXXFLAGS = -DYASSL_PURE_C
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue