diff options
| author | joerg@mysql.com <> | 2005-12-05 17:53:42 +0100 |
|---|---|---|
| committer | joerg@mysql.com <> | 2005-12-05 17:53:42 +0100 |
| commit | 7ce92291f039f6ebec328205701da59603c21c69 (patch) | |
| tree | b8da2a226ecc445e729c0c4b02c6ac76ec859903 /support-files | |
| parent | 84db1b25a251b53bc13b281f9926d016bf0c3670 (diff) | |
| download | mariadb-git-7ce92291f039f6ebec328205701da59603c21c69.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)
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 |