Commit 2ffb679a authored by kent@mysql.com's avatar kent@mysql.com

mysql.spec.sh:

  Use installed libz.a to avoid hard to solve static linking problems
parent b66567f6
...@@ -369,8 +369,8 @@ BuildMySQL "--disable-shared \ ...@@ -369,8 +369,8 @@ BuildMySQL "--disable-shared \
--with-client-ldflags='-all-static' \ --with-client-ldflags='-all-static' \
$USE_OTHER_LIBC_DIR \ $USE_OTHER_LIBC_DIR \
%else %else
%endif
--with-zlib-dir=bundled \ --with-zlib-dir=bundled \
%endif
--with-comment=\"MySQL Community Edition - Standard (GPL)\" \ --with-comment=\"MySQL Community Edition - Standard (GPL)\" \
--with-server-suffix='%{server_suffix}' \ --with-server-suffix='%{server_suffix}' \
--with-archive-storage-engine \ --with-archive-storage-engine \
...@@ -690,8 +690,11 @@ fi ...@@ -690,8 +690,11 @@ fi
%{_libdir}/mysql/libndbclient.a %{_libdir}/mysql/libndbclient.a
%{_libdir}/mysql/libndbclient.la %{_libdir}/mysql/libndbclient.la
%{_libdir}/mysql/libvio.a %{_libdir}/mysql/libvio.a
%if %{STATIC_BUILD}
%else
%{_libdir}/mysql/libz.a %{_libdir}/mysql/libz.a
%{_libdir}/mysql/libz.la %{_libdir}/mysql/libz.la
%endif
%files shared %files shared
%defattr(-, root, root, 0755) %defattr(-, root, root, 0755)
...@@ -723,6 +726,11 @@ fi ...@@ -723,6 +726,11 @@ fi
* Fri Mar 03 2006 Kent Boortz <kent@mysql.com> * Fri Mar 03 2006 Kent Boortz <kent@mysql.com>
- Don't output an embedded package as it is empty - 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> * Fri Jan 10 2006 Joerg Bruehe <joerg@mysql.com>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment