diff options
| author | unknown <lenz@mysql.com> | 2005-06-15 15:17:58 +0200 |
|---|---|---|
| committer | unknown <lenz@mysql.com> | 2005-06-15 15:17:58 +0200 |
| commit | 85d688a47a0450839b10ec0e02ab13bf651dd298 (patch) | |
| tree | 7fbf4c3def44986cec32a421e7c593411ab7acc9 | |
| parent | ad57284c6925fe19c182e5b43562e131e1297d7b (diff) | |
| parent | 228ec06370983740dcbdf24b5d35d358885d0882 (diff) | |
| download | mariadb-git-85d688a47a0450839b10ec0e02ab13bf651dd298.tar.gz | |
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/space/my/mysql-5.0
| -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 088fbf53698..b1ff78bdaf6 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 \ @@ -663,6 +667,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) |