summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@montyprogram.com>2012-11-23 13:50:46 +0100
committerVladislav Vaintroub <wlad@montyprogram.com>2012-11-23 13:50:46 +0100
commit3b572cd1197c7aa84010fd848908e41627f21a6d (patch)
tree2aa3971c9a795ad5e6077f74c35dc9f8c0d7407a /extra
parent089119cab57460a61851b8f387c72efddcf74a55 (diff)
downloadmariadb-git-3b572cd1197c7aa84010fd848908e41627f21a6d.tar.gz
MDEV-712 - LP:1024239 - Mysqlclient exports the same symbols as openssl
Compile yassl and taocrypt using -fvisibility=hidden, when possible. This prevent symbols from being exported.
Diffstat (limited to 'extra')
-rw-r--r--extra/yassl/src/Makefile.am3
-rw-r--r--extra/yassl/taocrypt/src/Makefile.am5
2 files changed, 5 insertions, 3 deletions
diff --git a/extra/yassl/src/Makefile.am b/extra/yassl/src/Makefile.am
index 300cdcd096f..fa45704f949 100644
--- a/extra/yassl/src/Makefile.am
+++ b/extra/yassl/src/Makefile.am
@@ -5,4 +5,5 @@ 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)
-AM_CXXFLAGS = -DYASSL_PURE_C -DYASSL_PREFIX @yassl_thread_cxxflags@
+AM_CXXFLAGS = -DYASSL_PURE_C -DYASSL_PREFIX @yassl_thread_cxxflags@ \
+ @SYMBOL_VISIBILITY@ @SYMBOL_VISIBILITY_INLINES@
diff --git a/extra/yassl/taocrypt/src/Makefile.am b/extra/yassl/taocrypt/src/Makefile.am
index bfc9bfe7084..eedbff3a759 100644
--- a/extra/yassl/taocrypt/src/Makefile.am
+++ b/extra/yassl/taocrypt/src/Makefile.am
@@ -9,6 +9,7 @@ libtaocrypt_la_SOURCES = aes.cpp aestables.cpp algebra.cpp arc4.cpp \
tftables.cpp twofish.cpp rabbit.cpp hc128.cpp
libtaocrypt_la_CXXFLAGS = @yassl_taocrypt_extra_cxxflags@ -DYASSL_PURE_C \
- @yassl_thread_cxxflags@
-
+ @yassl_thread_cxxflags@ \
+ @SYMBOL_VISIBILITY@ @SYMBOL_VISIBILITY_INLINES@
+
EXTRA_DIST = $(wildcard ../include/*.hpp)