diff options
| author | unknown <kent@mysql.com> | 2006-02-09 03:11:45 +0100 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2006-02-09 03:11:45 +0100 |
| commit | e653fbc322fd06b6350e848b3675faee3c05ce42 (patch) | |
| tree | d4e46dedd64e47753467d4e861b00d83399ae1ec | |
| parent | bfcd35e923e0f7586d59d273b670f0e95babe16d (diff) | |
| download | mariadb-git-e653fbc322fd06b6350e848b3675faee3c05ce42.tar.gz | |
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.
| -rw-r--r-- | server-tools/instance-manager/Makefile.am | 3 | ||||
| -rw-r--r-- | support-files/mysql.spec.sh | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/server-tools/instance-manager/Makefile.am b/server-tools/instance-manager/Makefile.am index 7449735f0bf..7afadf03ec1 100644 --- a/server-tools/instance-manager/Makefile.am +++ b/server-tools/instance-manager/Makefile.am @@ -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 \ diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 24f5ce41824..62f2bdb668d 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -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} \ |