Commit 4e1bc5ab authored by unknown's avatar unknown
Browse files

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


support-files/mysql.spec.sh:
  We cannot always use the bundled zlib, as this conflicts with the "shared" build of the "max" binary.
  The fully static RPM build on "build" also does not work with the bundled zlib.
  With this change, we use the bundled zlib for "standard" RPMs (unless fully stytic, "build")
  and the one already installed onm the system for the "max" build which is also labeled "experimental".
parent 3bb367f2

support-files/mysql.spec.sh

+2 −2
Original line number Diff line number Diff line
@@ -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}' \