MySQL Lists are EOL. Please join:

List:Internals« Previous MessageNext Message »
From:msvensson Date:November 24 2005 4:17pm
Subject:bk commit into 5.0 tree (msvensson:1.2000) BUG#15168
View as plain text  
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.2000 05/11/24 17:17:36 msvensson@stripped +5 -0
  Bug #15168  	yassl failure on amd64
   - Use libtool to build libraries

  libmysqld/examples/Makefile.am
    1.32 05/11/24 17:17:30 msvensson@stripped +2 -2
    Add yassl includes and libs when linking examples with libmysqld

  libmysqld/Makefile.am
    1.66 05/11/24 17:17:30 msvensson@stripped +1 -2
    Dont include yassl libs in libmysqld

  extra/yassl/taocrypt/src/Makefile.am
    1.11 05/11/24 17:17:29 msvensson@stripped +4 -8
    Let libtool build libraries
    Only build one lib

  extra/yassl/src/Makefile.am
    1.9 05/11/24 17:17:29 msvensson@stripped +2 -2
    Let libtool build libraries

  config/ac-macros/yassl.m4
    1.9 05/11/24 17:17:29 msvensson@stripped +4 -6
    If necessary, disable inlining for all files in libtaocrypt not only integer.cpp
    Remove ver yassl_libs_with_path, not used anymore

# 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:	devsrv-b.mysql.com
# Root:	/space/magnus/my50-bug15168

--- 1.65/libmysqld/Makefile.am	2005-11-04 01:41:32 +01:00
+++ 1.66/libmysqld/Makefile.am	2005-11-24 17:17:30 +01:00
@@ -80,8 +80,7 @@
 		$(top_builddir)/mysys/libmysys.a \
 		$(top_builddir)/strings/libmystrings.a \
 		$(top_builddir)/dbug/libdbug.a \
-		$(top_builddir)/vio/libvio.a \
-                @yassl_libs_with_path@
+		$(top_builddir)/vio/libvio.a
 		
 
 #

--- 1.8/config/ac-macros/yassl.m4	2005-10-28 11:41:27 +02:00
+++ 1.9/config/ac-macros/yassl.m4	2005-11-24 17:17:29 +01:00
@@ -16,7 +16,6 @@
     AC_MSG_RESULT([using bundled yaSSL])
     yassl_dir="extra/yassl"
     yassl_libs="-L\$(top_srcdir)/extra/yassl/src -lyassl -L\$(top_srcdir)/extra/yassl/taocrypt/src -ltaocrypt"
-    yassl_libs_with_path="\$(top_srcdir)/extra/yassl/src/libyassl.a \$(top_srcdir)/extra/yassl/taocrypt/src/libtaocrypt.a"
     yassl_includes="-I\$(top_srcdir)/extra/yassl/include"
     AC_DEFINE([HAVE_OPENSSL], [1], [Defined by configure. Using yaSSL for OpenSSL emulation.])
     AC_DEFINE([HAVE_YASSL], [1], [Defined by configure. Using yaSSL for OpenSSL emulation.])
@@ -24,12 +23,12 @@
     yassl_integer_extra_cxxflags=""
     case $host_cpu--$CXX_VERSION in
         sparc*--*Sun*C++*5.6*)
-	# Disable inlining when compiling taocrypt/src/integer.cpp
-	yassl_integer_extra_cxxflags="+d"
-        AC_MSG_NOTICE([disabling inlining for yassl/taocrypt/src/integer.cpp])
+	# Disable inlining when compiling taocrypt/src/
+	yassl_taocrypt_extra_cxxflags="+d"
+        AC_MSG_NOTICE([disabling inlining for yassl/taocrypt/src/])
         ;;
     esac
-    AC_SUBST([yassl_integer_extra_cxxflags])
+    AC_SUBST([yassl_taocrypt_extra_cxxflags])
 
   else
     yassl_dir=""
@@ -38,6 +37,5 @@
   AC_SUBST(yassl_libs)
   AC_SUBST(yassl_includes)
   AC_SUBST(yassl_dir)
-  AC_SUBST(yassl_libs_with_path)
   AM_CONDITIONAL([HAVE_YASSL], [ test "with_yassl" = "yes" ])
 ])

--- 1.8/extra/yassl/src/Makefile.am	2005-11-09 10:24:42 +01:00
+++ 1.9/extra/yassl/src/Makefile.am	2005-11-24 17:17:29 +01:00
@@ -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.10/extra/yassl/taocrypt/src/Makefile.am	2005-11-09 10:24:43 +01:00
+++ 1.11/extra/yassl/taocrypt/src/Makefile.am	2005-11-24 17:17:29 +01:00
@@ -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

--- 1.31/libmysqld/examples/Makefile.am	2005-11-04 02:00:26 +01:00
+++ 1.32/libmysqld/examples/Makefile.am	2005-11-24 17:17:30 +01:00
@@ -34,8 +34,8 @@
 DEFS = 		-DEMBEDDED_LIBRARY
 INCLUDES =	-I$(top_builddir)/include -I$(top_srcdir)/include -I$(srcdir) \
 		-I$(top_srcdir) -I$(top_srcdir)/client -I$(top_srcdir)/regex \
-		$(openssl_includes)
-LIBS =		@LIBS@ @WRAPLIBS@ @CLIENT_LIBS@
+		$(openssl_includes) $(yassl_includes)
+LIBS =		@LIBS@ @WRAPLIBS@ @CLIENT_LIBS@ $(yassl_libs)
 LDADD =		@CLIENT_EXTRA_LDFLAGS@ ../libmysqld.a @innodb_system_libs@ @LIBDL@ $(CXXLDFLAGS)
 
 mysqltest_embedded_LINK = $(CXXLINK)
Thread
bk commit into 5.0 tree (msvensson:1.2000) BUG#15168msvensson24 Nov