Commit b789b050 authored by unknown's avatar unknown

WL#2286 - Compile MySQL w/YASSL support

    Fix for link failures on boxes with non-gnu compiler.
    Fix for compilation failure on hpux11.


extra/yassl/taocrypt/src/misc.cpp:
  Adjust __HP_aCC value to solve compilation problem on hpux11.
tools/Makefile.am:
  Add a dummy C++ file to mysqltestmanager to make libtool use a C++ linker:
  this lets mysqltestmanager link when using yaSSL and a non-gcc C++ compiler.
parent 3ceb45f1
...@@ -136,7 +136,7 @@ unsigned long Crop(unsigned long value, unsigned int size) ...@@ -136,7 +136,7 @@ unsigned long Crop(unsigned long value, unsigned int size)
#if !(defined(_MSC_VER) && (_MSC_VER < 1300)) && \ #if !(defined(_MSC_VER) && (_MSC_VER < 1300)) && \
!(defined(__HP_aCC) && (__HP_aCC <= 35700)) !(defined(__HP_aCC) && (__HP_aCC <= 36300))
using std::new_handler; using std::new_handler;
using std::set_new_handler; using std::set_new_handler;
#endif #endif
......
...@@ -15,13 +15,18 @@ ...@@ -15,13 +15,18 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# Process this file with automake to create Makefile.in # Process this file with automake to create Makefile.in
if HAVE_YASSL
yassl_dummy_link_fix= $(top_srcdir)/extra/yassl/src/dummy.cpp
else
yassl_dummy_link_fix=
endif
INCLUDES=-I$(top_srcdir)/include $(openssl_includes) \ INCLUDES=-I$(top_srcdir)/include $(openssl_includes) \
-I$(top_builddir)/include -I$(top_builddir)/include
LDADD= @CLIENT_EXTRA_LDFLAGS@ \ LDADD= @CLIENT_EXTRA_LDFLAGS@ \
$(top_builddir)/libmysql_r/libmysqlclient_r.la \ $(top_builddir)/libmysql_r/libmysqlclient_r.la \
@openssl_libs@ @ZLIB_LIBS@ @openssl_libs@ @ZLIB_LIBS@
bin_PROGRAMS= mysqltestmanager bin_PROGRAMS= mysqltestmanager
mysqltestmanager_SOURCES= mysqlmanager.c mysqltestmanager_SOURCES= mysqlmanager.c $(yassl_dummy_link_fix)
mysqltestmanager_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES) mysqltestmanager_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES)
DEF= -DUNDEF_THREADS_HACK DEF= -DUNDEF_THREADS_HACK
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment