Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson 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.1944 05/10/18 15:43:59 msvensson@neptunus.(none) +9 -0
Bug #12985 Do-mysqlclient-test: Can't find -lyassl when linking
- Use yassl_includes and yassl_libs instead of openssl_includes and openssl_libs
to avoid that mysql_config returns that libyassl and libtaocrypt are needed for linking.
vio/Makefile.am
1.17 05/10/18 15:43:53 msvensson@neptunus.(none) +5 -5
Add yassl includes and libe
sql/Makefile.am
1.110 05/10/18 15:43:53 msvensson@neptunus.(none) +4 -2
Add yassl includes and libe
server-tools/instance-manager/Makefile.am
1.28 05/10/18 15:43:53 msvensson@neptunus.(none) +2 -2
Add yassl includes and lib
libmysqld/Makefile.am
1.62 05/10/18 15:43:53 msvensson@neptunus.(none) +1 -1
Add yassl_includes
libmysql_r/Makefile.am
1.21 05/10/18 15:43:53 msvensson@neptunus.(none) +2 -2
Add yassl_libs and yassl_includes
libmysql/Makefile.am
1.44 05/10/18 15:43:53 msvensson@neptunus.(none) +1 -1
Add yassl_includes
configure.in
1.346 05/10/18 15:43:53 msvensson@neptunus.(none) +2 -2
Add yassl_libs to lib_DEPENDENCIES and CLIENT_LIBS
config/ac-macros/yassl.m4
1.5 05/10/18 15:43:53 msvensson@neptunus.(none) +4 -6
Use own variables for yassl, don't intrude on openssl
client/Makefile.am
1.50 05/10/18 15:43:53 msvensson@neptunus.(none) +4 -2
Add yassl_includes
# 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: msvensson
# Host: neptunus.(none)
# Root: /home/msvensson/mysql/bug12985/my50-bug12985
--- 1.49/client/Makefile.am 2005-07-05 23:48:39 +02:00
+++ 1.50/client/Makefile.am 2005-10-18 15:43:53 +02:00
@@ -22,8 +22,10 @@
yassl_dummy_link_fix=
endif
#AUTOMAKE_OPTIONS = nostdinc
-INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
- -I$(top_srcdir)/regex $(openssl_includes)
+INCLUDES = -I$(top_builddir)/include \
+ -I$(top_srcdir)/include \
+ -I$(top_srcdir)/regex \
+ $(openssl_includes) $(yassl_includes)
LIBS = @CLIENT_LIBS@
LDADD= @CLIENT_EXTRA_LDFLAGS@ \
$(top_builddir)/libmysql/libmysqlclient.la
--- 1.345/configure.in 2005-09-13 02:00:46 +02:00
+++ 1.346/configure.in 2005-10-18 15:43:53 +02:00
@@ -1139,7 +1139,7 @@
sql/Makefile.in)
# Use gen_lex_hash.linux instead of gen_lex_hash
# Add library dependencies to mysqld_DEPENDENCIES
- lib_DEPENDENCIES="\$(bdb_libs_with_path) \$(innodb_libs) \$(ndbcluster_libs) \$(pstack_libs) \$(innodb_system_libs) \$(openssl_libs)"
+ lib_DEPENDENCIES="\$(bdb_libs_with_path) \$(innodb_libs) \$(ndbcluster_libs) \$(pstack_libs) \$(innodb_system_libs) \$(openssl_libs) \$(yassl_libs)"
cat > $filesed << EOF
s,\(^.*\$(MAKE) gen_lex_hash\)\$(EXEEXT),#\1,
s,\(\./gen_lex_hash\)\$(EXEEXT),\1.linux,
@@ -2423,7 +2423,7 @@
AC_DEFINE([THREAD_SAFE_CLIENT], [1], [Should be client be thread safe])
fi
-CLIENT_LIBS="$NON_THREADED_LIBS $openssl_libs $ZLIB_LIBS $STATIC_NSS_FLAGS"
+CLIENT_LIBS="$NON_THREADED_LIBS $openssl_libs $yassl_libs $ZLIB_LIBS $STATIC_NSS_FLAGS"
AC_SUBST(CLIENT_LIBS)
AC_SUBST(NON_THREADED_LIBS)
--- 1.43/libmysql/Makefile.am 2005-07-05 23:53:43 +02:00
+++ 1.44/libmysql/Makefile.am 2005-10-18 15:43:53 +02:00
@@ -24,7 +24,7 @@
target_defs = -DUNDEF_THREADS_HACK -DDONT_USE_RAID @LIB_EXTRA_CCFLAGS@
LIBS = @CLIENT_LIBS@
INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
- $(openssl_includes) @ZLIB_INCLUDES@
+ $(openssl_includes) $(yassl_includes) @ZLIB_INCLUDES@
include $(srcdir)/Makefile.shared
--- 1.109/sql/Makefile.am 2005-08-25 21:41:46 +02:00
+++ 1.110/sql/Makefile.am 2005-10-18 15:43:53 +02:00
@@ -22,7 +22,8 @@
INCLUDES = @ZLIB_INCLUDES@ \
@bdb_includes@ @innodb_includes@ @ndbcluster_includes@ \
-I$(top_builddir)/include -I$(top_srcdir)/include \
- -I$(top_srcdir)/regex -I$(srcdir) $(openssl_includes)
+ -I$(top_srcdir)/regex -I$(srcdir) $(yassl_includes) \
+ $(openssl_includes)
WRAPLIBS= @WRAPLIBS@
SUBDIRS = share
libexec_PROGRAMS = mysqld
@@ -42,7 +43,8 @@
@bdb_libs@ @innodb_libs@ @pstack_libs@ \
@innodb_system_libs@ \
@ndbcluster_libs@ @ndbcluster_system_libs@ \
- $(LDADD) $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ @openssl_libs@
+ $(LDADD) $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ \
+ @yassl_libs@ @openssl_libs@
noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \
item_strfunc.h item_timefunc.h item_uniq.h \
item_create.h item_subselect.h item_row.h \
--- 1.16/vio/Makefile.am 2005-07-06 00:06:08 +02:00
+++ 1.17/vio/Makefile.am 2005-10-18 15:43:53 +02:00
@@ -20,23 +20,23 @@
yassl_dummy_link_fix=
endif
INCLUDES= -I$(top_builddir)/include -I$(top_srcdir)/include \
- $(openssl_includes)
-LDADD= @CLIENT_EXTRA_LDFLAGS@ $(openssl_libs)
+ $(openssl_includes) $(yassl_includes)
+LDADD= @CLIENT_EXTRA_LDFLAGS@ $(openssl_libs) $(yassl_libs)
pkglib_LIBRARIES= libvio.a
noinst_PROGRAMS = test-ssl test-sslserver test-sslclient
noinst_HEADERS= vio_priv.h
test_ssl_SOURCES= test-ssl.c $(yassl_dummy_link_fix)
test_ssl_LDADD= @CLIENT_EXTRA_LDFLAGS@ ../dbug/libdbug.a libvio.a \
../mysys/libmysys.a ../strings/libmystrings.a \
- $(openssl_libs)
+ $(openssl_libs) $(yassl_libs)
test_sslserver_SOURCES= test-sslserver.c $(yassl_dummy_link_fix)
test_sslserver_LDADD= @CLIENT_EXTRA_LDFLAGS@ ../dbug/libdbug.a libvio.a \
../mysys/libmysys.a ../strings/libmystrings.a \
- $(openssl_libs)
+ $(openssl_libs) $(yassl_libs)
test_sslclient_SOURCES= test-sslclient.c $(yassl_dummy_link_fix)
test_sslclient_LDADD= @CLIENT_EXTRA_LDFLAGS@ ../dbug/libdbug.a libvio.a \
../mysys/libmysys.a ../strings/libmystrings.a \
- $(openssl_libs)
+ $(openssl_libs) $(yassl_libs)
libvio_a_SOURCES= vio.c viosocket.c viossl.c viosslfactories.c
# Don't update the files from bitkeeper
--- 1.27/server-tools/instance-manager/Makefile.am 2005-08-29 21:29:26 +02:00
+++ 1.28/server-tools/instance-manager/Makefile.am 2005-10-18 15:43:53 +02:00
@@ -15,7 +15,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
INCLUDES= @ZLIB_INCLUDES@ -I$(top_srcdir)/include \
- $(openssl_includes) -I$(top_builddir)/include
+ @openssl_includes@ @yassl_includes@ -I$(top_builddir)/include
DEFS= -DMYSQL_INSTANCE_MANAGER -DMYSQL_SERVER
@@ -85,7 +85,7 @@
$(top_builddir)/mysys/libmysys.a \
$(top_builddir)/strings/libmystrings.a \
$(top_builddir)/dbug/libdbug.a \
- @openssl_libs@ @ZLIB_LIBS@
+ @openssl_libs@ @yassl_libs@ @ZLIB_LIBS@
tags:
--- 1.61/libmysqld/Makefile.am 2005-07-05 23:56:19 +02:00
+++ 1.62/libmysqld/Makefile.am 2005-10-18 15:43:53 +02:00
@@ -29,7 +29,7 @@
-I$(top_builddir)/include -I$(top_srcdir)/include \
-I$(top_srcdir)/sql -I$(top_srcdir)/sql/examples \
-I$(top_srcdir)/regex \
- $(openssl_includes) @ZLIB_INCLUDES@
+ $(openssl_includes) $(yassl_includes) @ZLIB_INCLUDES@
noinst_LIBRARIES = libmysqld_int.a
pkglib_LIBRARIES = libmysqld.a
--- 1.4/config/ac-macros/yassl.m4 2005-06-18 16:10:42 +02:00
+++ 1.5/config/ac-macros/yassl.m4 2005-10-18 15:43:53 +02:00
@@ -15,17 +15,15 @@
fi
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"
- openssl_includes="-I\$(top_srcdir)/extra/yassl/include"
+ yassl_libs="-L\$(top_srcdir)/extra/yassl/src -lyassl -L\$(top_srcdir)/extra/yassl/taocrypt/src -ltaocrypt"
+ yassl_includes="-I\$(top_srcdir)/extra/yassl/include"
AC_DEFINE([HAVE_OPENSSL], [1], [Defined by configure. Using yaSSL for OpenSSL emulation.])
else
yassl_dir=""
AC_MSG_RESULT(no)
fi
- AC_SUBST(openssl_libs)
- AC_SUBST(openssl_includes)
+ AC_SUBST(yassl_libs)
+ AC_SUBST(yassl_includes)
AC_SUBST(yassl_dir)
AM_CONDITIONAL([HAVE_YASSL], [ test "with_yassl" = "yes" ])
])
--- 1.20/libmysql_r/Makefile.am 2005-07-05 23:55:10 +02:00
+++ 1.21/libmysql_r/Makefile.am 2005-10-18 15:43:53 +02:00
@@ -22,10 +22,10 @@
target = libmysqlclient_r.la
target_defs = -DDONT_USE_RAID -DMYSQL_CLIENT @LIB_EXTRA_CCFLAGS@
-LIBS = @LIBS@ @ZLIB_LIBS@ @openssl_libs@
+LIBS = @LIBS@ @ZLIB_LIBS@ @openssl_libs@ @yassl_libs@
INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
- $(openssl_includes) @ZLIB_INCLUDES@
+ $(openssl_includes) $(yassl_includes) @ZLIB_INCLUDES@
## automake barfs if you don't use $(srcdir) or $(top_srcdir) in include
include $(top_srcdir)/libmysql/Makefile.shared
| Thread |
|---|
| • bk commit into 5.0 tree (msvensson:1.1944) BUG#12985 | msvensson | 18 Oct |
