Commit e653fbc3 authored by unknown's avatar unknown
Browse files

Makefile.am: 

  Link with CLIENT_EXTRA_LDFLAGS, enable us to
  pass on libtool flags '-full-static' and '-static'
  using '--with-client-ldflags' to configure.
mysql.spec.sh:
  Pass '-static' to libtool, link static with our
  own libraries, dynamic with system libraries.
  Link with the bundled zlib.


support-files/mysql.spec.sh:
  Pass '-static' to libtool, link static with our
  own libraries, dynamic with system libraries.
  Link with the bundled zlib.
server-tools/instance-manager/Makefile.am:
  Link with CLIENT_EXTRA_LDFLAGS, enable us to
  pass on libtool flags '-full-static' and '-static'
  using '--with-client-ldflags' to configure.
parent bfcd35e9

server-tools/instance-manager/Makefile.am

+2 −1
Original line number Diff line number Diff line
@@ -79,7 +79,8 @@ mysqlmanager_SOURCES= command.cc command.h mysqlmanager.cc \ 
                        mysql_manager_error.h \

                        portability.h



mysqlmanager_LDADD=	liboptions.a \

mysqlmanager_LDADD=	@CLIENT_EXTRA_LDFLAGS@ \

			liboptions.a \

			libnet.a \

			$(top_builddir)/vio/libvio.a \

			$(top_builddir)/mysys/libmysys.a \

support-files/mysql.spec.sh

+3 −0
Original line number Diff line number Diff line
@@ -217,6 +217,9 @@ sh -c "PATH=\"${MYSQL_BUILD_PATH:-$PATH}\" \ 
	CXXFLAGS=\"$CXXFLAGS\" \

	./configure \

 	    $* \

	    --with-mysqld-ldflags='-static' \

	    --with-client-ldflags='-static' \

	    --with-zlib-dir=bundled \

	    --enable-assembler \

	    --enable-local-infile \

            --with-mysqld-user=%{mysqld_user} \