diff options
| author | lenz@mysql.com <> | 2005-06-14 21:39:08 +0200 |
|---|---|---|
| committer | lenz@mysql.com <> | 2005-06-14 21:39:08 +0200 |
| commit | 90479d9ece464c21108539369f81de0f26f1c3b8 (patch) | |
| tree | b9eea80a149dfc6d616ba7846c4f6ccf603ae601 /support-files | |
| parent | 14da13ea6336717608a5949b9128516f8c813e1f (diff) | |
| download | mariadb-git-90479d9ece464c21108539369f81de0f26f1c3b8.tar.gz | |
- Do not build the RPMs 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.
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 0b48af47389..06e9c2c75f0 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 @@ -341,7 +345,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) |