diff options
| author | unknown <joerg@mysql.com> | 2005-11-11 22:18:41 +0100 |
|---|---|---|
| committer | unknown <joerg@mysql.com> | 2005-11-11 22:18:41 +0100 |
| commit | 4e1bc5abd823a9306f89922f69912351832365c1 (patch) | |
| tree | c3d224bff7f1443029c50246fd5890d6d95643e9 /support-files | |
| parent | 3bb367f28221bc70eead187fa3343dd74084fcd1 (diff) | |
| download | mariadb-git-4e1bc5abd823a9306f89922f69912351832365c1.tar.gz | |
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".
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/mysql.spec.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 7b2eee5f821..991afd367c0 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -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}' \ |