Commit 3d431536 authored by unknown's avatar unknown
Browse files

WL#2286 - Compile MySQL w/YASSL support 

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


client/Makefile.am:
  Add a dummy C++ file to client suite to make libtool use a C++ linker:
  this lets client suite link when using yaSSL and a non-gcc C++ compiler.
config/ac-macros/yassl.m4:
  HAVE_YASSL conditional is used to add dummy C++ file if configured with yaSSL.
tests/Makefile.am:
  Add a dummy C++ file to tests to make libtool use a C++ linker:
  this lets tests link when using yaSSL and a non-gcc C++ compiler.
vio/Makefile.am:
  Use dummy C++ file if configured with yaSSL only.
parent b85705cc

client/Makefile.am

+12 −2
Original line number Diff line number Diff line
@@ -16,6 +16,11 @@ 


# This file is public domain and comes with NO WARRANTY of any kind



if HAVE_YASSL

  yassl_dummy_link_fix= $(top_srcdir)/extra/yassl/src/dummy.cpp

else

  yassl_dummy_link_fix=

endif

#AUTOMAKE_OPTIONS =              nostdinc

INCLUDES =			-I$(top_srcdir)/include -I$(top_srcdir)/regex \

				$(openssl_includes) -I$(top_builddir)/include
@@ -30,12 +35,17 @@ noinst_HEADERS = sql_string.h completion_hash.h my_readline.h \ 
mysql_SOURCES =			mysql.cc readline.cc sql_string.cc completion_hash.cc

mysqladmin_SOURCES =		mysqladmin.cc

mysql_LDADD =			@readline_link@ @TERMCAP_LIB@ $(LDADD) $(CXXLDFLAGS)

mysqltest_SOURCES=		mysqltest.c $(top_srcdir)/mysys/my_getsystime.c

mysqltest_SOURCES=              mysqltest.c $(top_srcdir)/mysys/my_getsystime.c \

                                $(yassl_dummy_link_fix)

mysqltest_LDADD =		$(top_builddir)/regex/libregex.a $(LDADD)

mysqlbinlog_SOURCES =   mysqlbinlog.cc $(top_srcdir)/mysys/mf_tempdir.c $(top_srcdir)/mysys/my_new.cc

mysqlbinlog_LDADD =		$(LDADD) $(CXXLDFLAGS)

mysqltestmanagerc_SOURCES =   mysqlmanagerc.c 

mysqltestmanager_pwgen_SOURCES =   mysqlmanager-pwgen.c 

mysqltestmanagerc_SOURCES=      mysqlmanagerc.c $(yassl_dummy_link_fix)

mysqlcheck_SOURCES=             mysqlcheck.c $(yassl_dummy_link_fix)

mysqlshow_SOURCES=              mysqlshow.c $(yassl_dummy_link_fix)

mysqldump_SOURCES=              mysqldump.c $(yassl_dummy_link_fix)

mysqlimport_SOURCES=            mysqlimport.c $(yassl_dummy_link_fix)

sql_src=log_event.h mysql_priv.h log_event.cc my_decimal.h my_decimal.cc

strings_src=decimal.c

config/ac-macros/yassl.m4

+1 −0
Original line number Diff line number Diff line
@@ -30,4 +30,5 @@ AC_DEFUN([MYSQL_CHECK_YASSL], [ 
  AC_SUBST(openssl_libs)

  AC_SUBST(openssl_includes)

  AC_SUBST(yassl_dir)

  AM_CONDITIONAL([HAVE_YASSL], [ test "$yassl" = "yes" ])

])

tests/Makefile.am

+8 −1
Original line number Diff line number Diff line
@@ -17,6 +17,11 @@ 


## 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

EXTRA_DIST =		auto_increment.res auto_increment.tst \

			function.res function.tst lock_test.pl lock_test.res \

			export.pl big_record.pl \
@@ -38,7 +43,9 @@ LDADD = @CLIENT_EXTRA_LDFLAGS@ \ 
                        $(top_builddir)/libmysql/libmysqlclient.la

mysql_client_test_LDADD= $(LDADD) $(CXXLDFLAGS) \

                        $(top_builddir)/mysys/libmysys.a

mysql_client_test_SOURCES= mysql_client_test.c

mysql_client_test_SOURCES= mysql_client_test.c $(yassl_dummy_link_fix)

insert_test_SOURCES=       insert_test.c $(yassl_dummy_link_fix)

select_test_SOURCES=       select_test.c $(yassl_dummy_link_fix)

insert_test_DEPENDENCIES=	$(LIBRARIES) $(pkglib_LTLIBRARIES)

select_test_DEPENDENCIES=	$(LIBRARIES) $(pkglib_LTLIBRARIES)

vio/Makefile.am

+8 −5
Original line number Diff line number Diff line
@@ -14,22 +14,25 @@ 
# along with this program; if not, write to the Free Software

# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA



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)

LDADD=			@CLIENT_EXTRA_LDFLAGS@ $(openssl_libs) 

pkglib_LIBRARIES=	libvio.a

noinst_PROGRAMS	=	test-ssl test-sslserver test-sslclient

noinst_HEADERS=	vio_priv.h

test_ssl_SOURCES=	test-ssl.c $(top_srcdir)/extra/yassl/src/dummy.cpp

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)

test_sslserver_SOURCES= test-sslserver.c \

                        $(top_srcdir)/extra/yassl/src/dummy.cpp

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)

test_sslclient_SOURCES= test-sslclient.c \

                        $(top_srcdir)/extra/yassl/src/dummy.cpp

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)