diff options
| author | unknown <joerg@mysql.com> | 2005-12-05 17:53:42 +0100 |
|---|---|---|
| committer | unknown <joerg@mysql.com> | 2005-12-05 17:53:42 +0100 |
| commit | 966ab524a336bb22088d4adbb7db7a090762551e (patch) | |
| tree | b8da2a226ecc445e729c0c4b02c6ac76ec859903 /support-files | |
| parent | dab2d2021a0cee026f425f0aace1fd5a775408c1 (diff) | |
| download | mariadb-git-966ab524a336bb22088d4adbb7db7a090762551e.tar.gz | |
Not all RPM builds can use the bundled zlib, due to dependency and link conflicts. Solve this.
(Backport of an identical change from 5.0)
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 static, "build")
and the one already installed on the system for the "max" build which is also labeled "experimental".
(Backport of an identical change from 5.0)
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/mysql.spec.sh | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 3d9c2d544ee..7afdae69439 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -249,7 +249,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 @@ -351,8 +350,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}' \ @@ -689,6 +689,12 @@ fi # itself - note that they must be ordered by date (important when # merging BK trees) %changelog +* Mon Dec 05 2005 Joerg Bruehe <joerg@mysql.com> + +- Avoid using the "bundled" zlib on "shared" builds: + As it is not installed (on the build system), this gives dependency + problems with "libtool" causing the build to fail. + * Tue Nov 22 2005 Joerg Bruehe <joerg@mysql.com> - Extend the file existence check for "init.d/mysql" on un-install |