Commit 9f065041 authored by joerg@mysql.com's avatar joerg@mysql.com

Not all RPM builds can use the bundled zlib, due to dependency and link conflicts. Solve this.

parent 9e079794
......@@ -259,7 +259,6 @@ sh -c "PATH=\"${MYSQL_BUILD_PATH:-$PATH}\" \
--includedir=%{_includedir} \
--mandir=%{_mandir} \
--enable-thread-safe-client \
--with-zlib-dir=bundled \
--with-readline ; \
# Add this for more debugging support
# --with-debug
......@@ -362,8 +361,9 @@ BuildMySQL "--disable-shared \
%if %{STATIC_BUILD}
--with-mysqld-ldflags='-all-static' \
--with-client-ldflags='-all-static' \
--with-zlib-dir=bundled \
$USE_OTHER_LIBC_DIR \
%else
--with-zlib-dir=bundled \
%endif
--with-comment=\"MySQL Community Edition - Standard (GPL)\" \
--with-server-suffix='%{server_suffix}' \
......
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