mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
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.
This commit is contained in:
@ -79,7 +79,8 @@ mysqlmanager_SOURCES= command.cc command.h mysqlmanager.cc \
|
|||||||
mysql_manager_error.h \
|
mysql_manager_error.h \
|
||||||
portability.h
|
portability.h
|
||||||
|
|
||||||
mysqlmanager_LDADD= liboptions.a \
|
mysqlmanager_LDADD= @CLIENT_EXTRA_LDFLAGS@ \
|
||||||
|
liboptions.a \
|
||||||
libnet.a \
|
libnet.a \
|
||||||
$(top_builddir)/vio/libvio.a \
|
$(top_builddir)/vio/libvio.a \
|
||||||
$(top_builddir)/mysys/libmysys.a \
|
$(top_builddir)/mysys/libmysys.a \
|
||||||
|
@ -217,6 +217,9 @@ sh -c "PATH=\"${MYSQL_BUILD_PATH:-$PATH}\" \
|
|||||||
CXXFLAGS=\"$CXXFLAGS\" \
|
CXXFLAGS=\"$CXXFLAGS\" \
|
||||||
./configure \
|
./configure \
|
||||||
$* \
|
$* \
|
||||||
|
--with-mysqld-ldflags='-static' \
|
||||||
|
--with-client-ldflags='-static' \
|
||||||
|
--with-zlib-dir=bundled \
|
||||||
--enable-assembler \
|
--enable-assembler \
|
||||||
--enable-local-infile \
|
--enable-local-infile \
|
||||||
--with-mysqld-user=%{mysqld_user} \
|
--with-mysqld-user=%{mysqld_user} \
|
||||||
|
Reference in New Issue
Block a user