Below is the list of changes that have just been committed into a local
5.0 repository of svoj. When svoj does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet
1.2009 05/06/25 18:13:06 svoj@stripped +7 -0
WL#2286 - Compile MySQL w/YASSL support
Let yaSSL use libtool.
scripts/mysql_config.sh
1.18 05/06/25 18:13:00 svoj@stripped +2 -2
Use SSL_DEPS instead of openssl_libs.
scripts/Makefile.am
1.45 05/06/25 18:13:00 svoj@stripped +1 -1
Use SSL_DEPS instead of openssl_libs.
mysql-test/mysql-test-run.sh
1.272 05/06/25 18:13:00 svoj@stripped +2 -0
yaSSL libraries path added.
extra/yassl/taocrypt/src/Makefile.am
1.5 05/06/25 18:12:59 svoj@stripped +3 -2
Let yaSSL use libtool.
extra/yassl/src/Makefile.am
1.5 05/06/25 18:12:59 svoj@stripped +3 -2
Let yaSSL use libtool.
config/ac-macros/yassl.m4
1.4 05/06/25 18:12:59 svoj@stripped +4 -2
SSL_DEPS variable added. Intended to be used for yaSSL/OpenSSL dependencies tracking.
Let yaSSL use libtool.
config/ac-macros/openssl.m4
1.5 05/06/25 18:12:59 svoj@stripped +2 -0
SSL_DEPS variable added. Intended to be used for yaSSL/OpenSSL dependencies tracking.
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: svoj
# Host: svoj.pils.ru
# Root: /home/svoj/devel/mysql/yassl-mysql-5.01
--- 1.271/mysql-test/mysql-test-run.sh 2005-06-16 21:30:15 +05:00
+++ 1.272/mysql-test/mysql-test-run.sh 2005-06-25 18:13:00 +05:00
@@ -196,7 +196,9 @@
# Set LD_LIBRARY_PATH if we are using shared libraries
#
LD_LIBRARY_PATH="$BASEDIR/lib:$BASEDIR/libmysql/.libs:$BASEDIR/zlib/.libs:$LD_LIBRARY_PATH"
+LD_LIBRARY_PATH="$BASEDIR/extra/yassl/src/.libs:$BASEDIR/extra/yassl/taocrypt/src/.libs:$LD_LIBRARY_PATH"
DYLD_LIBRARY_PATH="$BASEDIR/lib:$BASEDIR/libmysql/.libs:$BASEDIR/zlib/.libs:$DYLD_LIBRARY_PATH"
+DYLD_LIBRARY_PATH="$BASEDIR/extra/yassl/src/.libs:$BASEDIR/extra/yassl/taocrypt/src/.libs:$DYLD_LIBRARY_PATH"
export LD_LIBRARY_PATH DYLD_LIBRARY_PATH
#
--- 1.44/scripts/Makefile.am 2005-06-07 14:02:15 +05:00
+++ 1.45/scripts/Makefile.am 2005-06-25 18:13:00 +05:00
@@ -122,7 +122,7 @@
-e 's!@''LIBS''@!@LIBS@!' \
-e 's!@''WRAPLIBS''@!@WRAPLIBS@!' \
-e 's!@''innodb_system_libs''@!@innodb_system_libs@!' \
- -e 's!@''openssl_libs''@!@openssl_libs@!' \
+ -e 's!@''SSL_DEPS''@!@SSL_DEPS@!' \
-e 's!@''VERSION''@!@VERSION@!' \
-e 's!@''MYSQL_SERVER_SUFFIX''@!@MYSQL_SERVER_SUFFIX@!' \
-e 's!@''COMPILATION_COMMENT''@!@COMPILATION_COMMENT@!' \
--- 1.17/scripts/mysql_config.sh 2005-02-05 02:21:11 +04:00
+++ 1.18/scripts/mysql_config.sh 2005-06-25 18:13:00 +05:00
@@ -86,10 +86,10 @@
# Create options
libs="$ldflags -L$pkglibdir -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@"
-libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@"
+libs="$libs @SSL_DEPS@ @STATIC_NSS_FLAGS@"
libs=`echo "$libs" | sed -e 's; \+; ;g' | sed -e 's;^ *;;' | sed -e 's; *\$;;'`
-libs_r="$ldflags -L$pkglibdir -lmysqlclient_r @ZLIB_DEPS@ @LIBS@ @openssl_libs@"
+libs_r="$ldflags -L$pkglibdir -lmysqlclient_r @ZLIB_DEPS@ @LIBS@ @SSL_DEPS@"
libs_r=`echo "$libs_r" | sed -e 's; \+; ;g' | sed -e 's;^ *;;' | sed -e 's; *\$;;'`
cflags="-I$pkgincludedir @CFLAGS@ " #note: end space!
include="-I$pkgincludedir"
--- 1.4/config/ac-macros/openssl.m4 2005-04-26 15:16:08 +05:00
+++ 1.5/config/ac-macros/openssl.m4 2005-06-25 18:12:59 +05:00
@@ -128,6 +128,8 @@
AC_MSG_ERROR(Can't have --with-openssl-libs without --with-openssl);
fi
fi
+ SSL_DEPS="$openssl_libs"
AC_SUBST(openssl_libs)
AC_SUBST(openssl_includes)
+ AC_SUBST(SSL_DEPS)
])
--- 1.3/config/ac-macros/yassl.m4 2005-06-12 18:18:42 +05:00
+++ 1.4/config/ac-macros/yassl.m4 2005-06-25 18:12:59 +05:00
@@ -19,9 +19,10 @@
AC_MSG_RESULT([using bundled yaSSL])
yassl_dir="extra/yassl"
openssl_libs="\
- -L\$(top_builddir)/extra/yassl/src -lyassl\
- -L\$(top_builddir)/extra/yassl/taocrypt/src -ltaocrypt"
+ \$(top_builddir)/extra/yassl/src/libyassl.la\
+ \$(top_builddir)/extra/yassl/taocrypt/src/libtaocrypt.la"
openssl_includes="-I\$(top_srcdir)/extra/yassl/include"
+ SSL_DEPS="-lyassl -ltaocrypt"
AC_DEFINE([HAVE_OPENSSL], [1], [Defined by configure. Using yaSSL for OpenSSL emulation.])
else
yassl_dir=""
@@ -30,5 +31,6 @@
AC_SUBST(openssl_libs)
AC_SUBST(openssl_includes)
AC_SUBST(yassl_dir)
+ AC_SUBST(SSL_DEPS)
AM_CONDITIONAL([HAVE_YASSL], [ test "$yassl" = "yes" ])
])
--- 1.4/extra/yassl/src/Makefile.am 2005-05-31 20:56:24 +05:00
+++ 1.5/extra/yassl/src/Makefile.am 2005-06-25 18:12:59 +05:00
@@ -1,7 +1,8 @@
INCLUDES = -I../include -I../taocrypt/include -I../mySTL
-noinst_LIBRARIES = libyassl.a
-libyassl_a_SOURCES = buffer.cpp cert_wrapper.cpp crypto_wrapper.cpp \
+pkglib_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
+libyassl_la_LDFLAGS = -version-info 1:0:0
EXTRA_DIST = ../include/*.hpp ../include/openssl/*.h
--- 1.4/extra/yassl/taocrypt/src/Makefile.am 2005-05-31 20:56:25 +05:00
+++ 1.5/extra/yassl/taocrypt/src/Makefile.am 2005-06-25 18:12:59 +05:00
@@ -1,8 +1,9 @@
INCLUDES = -I../include -I../../mySTL
-noinst_LIBRARIES = libtaocrypt.a
-libtaocrypt_a_SOURCES = aes.cpp aestables.cpp algebra.cpp arc4.cpp asn.cpp \
+pkglib_LTLIBRARIES = libtaocrypt.la
+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 integer.cpp \
md2.cpp md5.cpp misc.cpp random.cpp ripemd.cpp rsa.cpp sha.cpp \
template_instnt.cpp
+libtaocrypt_la_LDFLAGS = -version-info 1:0:0
EXTRA_DIST = ../include/*.hpp
| Thread |
|---|
| • bk commit into 5.0 tree (svoj:1.2009) | svoj | 25 Jun |
