diff options
| author | unknown <kent@mysql.com> | 2006-03-03 20:30:28 +0100 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2006-03-03 20:30:28 +0100 |
| commit | 0dcd02587dbcfee967e508da856c021398f2192d (patch) | |
| tree | 7cb995f05b3b6767de94e93d9c2fadafc08a98fe /support-files | |
| parent | 12e04a4c30cd397889c956b44cbe0ca2fc3601f3 (diff) | |
| download | mariadb-git-0dcd02587dbcfee967e508da856c021398f2192d.tar.gz | |
mysql.spec.sh:
Use installed libz.a to avoid hard to solve static linking problems
support-files/mysql.spec.sh:
Use installed libz.a to avoid hard to solve static linking problems
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/mysql.spec.sh | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 599f397e351..5860e612e66 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -369,8 +369,8 @@ BuildMySQL "--disable-shared \ --with-client-ldflags='-all-static' \ $USE_OTHER_LIBC_DIR \ %else -%endif --with-zlib-dir=bundled \ +%endif --with-comment=\"MySQL Community Edition - Standard (GPL)\" \ --with-server-suffix='%{server_suffix}' \ --with-archive-storage-engine \ @@ -690,8 +690,11 @@ fi %{_libdir}/mysql/libndbclient.a %{_libdir}/mysql/libndbclient.la %{_libdir}/mysql/libvio.a +%if %{STATIC_BUILD} +%else %{_libdir}/mysql/libz.a %{_libdir}/mysql/libz.la +%endif %files shared %defattr(-, root, root, 0755) @@ -723,6 +726,11 @@ fi * Fri Mar 03 2006 Kent Boortz <kent@mysql.com> - Don't output an embedded package as it is empty +- Can't use bundled zlib when doing static build. Might be a + automake/libtool problem, having two .la files, "libmysqlclient.la" + and "libz.la", on the same command line to link "thread_test" + expands to too many "-lc", "-lpthread" and other libs giving hard + to nail down duplicate symbol defintion problems. * Fri Jan 10 2006 Joerg Bruehe <joerg@mysql.com> |