diff options
| author | unknown <lenz@mysql.com> | 2005-06-15 12:48:08 +0200 |
|---|---|---|
| committer | unknown <lenz@mysql.com> | 2005-06-15 12:48:08 +0200 |
| commit | 60c292bfb69cd3558c641c428554722e8e16a458 (patch) | |
| tree | 611328752b8103591bd8b8840026cbf62f38164c /support-files | |
| parent | 1e997db8d200f21e5c8dee05ccb7abb9766cdd02 (diff) | |
| parent | 228ec06370983740dcbdf24b5d35d358885d0882 (diff) | |
| download | mariadb-git-60c292bfb69cd3558c641c428554722e8e16a458.tar.gz | |
Merge mysql.com:/space/my/mysql-5.0 into mysql.com:/space/my/mysql-5.1
support-files/mysql.spec.sh:
Auto merged
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/mysql.spec.sh | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 4c58eafd354..9df255a611a 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -1,5 +1,9 @@ %define mysql_version @VERSION@ -%ifarch i386 +# use "rpmbuild --with static" or "rpm --define '_with_static 1'" (for RPM 3.x) +# to enable static linking (off by default) +%{?_with_static:%define STATIC_BUILD 1} +%{!?_with_static:%define STATIC_BUILD 0} +%if %{STATIC_BUILD} %define release 0 %else %define release 0.glibc23 @@ -342,7 +346,7 @@ make clean # so don't link statically there # BuildMySQL "--disable-shared \ -%ifarch i386 +%if %{STATIC_BUILD} --with-mysqld-ldflags='-all-static' \ --with-client-ldflags='-all-static' \ $USE_OTHER_LIBC_DIR \ @@ -662,6 +666,13 @@ fi # itself - note that they must be ordered by date (important when # merging BK trees) %changelog +* Tue Jun 14 2005 Lenz Grimmer <lenz@mysql.com> + +- Do not build statically on i386 by default, only when adding either "--with + static" or "--define '_with_static 1'" to the RPM build options. Static + linking really only makes sense when linking against the specially patched + glibc 2.2.5. + * Mon Jun 06 2005 Lenz Grimmer <lenz@mysql.com> - added mysql_client_test to the "bench" subpackage (BUG 10676) |