mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
- 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. support-files/mysql.spec.sh: - 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.
This commit is contained in:
@ -1,5 +1,9 @@
|
|||||||
%define mysql_version @VERSION@
|
%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
|
%define release 0
|
||||||
%else
|
%else
|
||||||
%define release 0.glibc23
|
%define release 0.glibc23
|
||||||
@ -341,7 +345,7 @@ make clean
|
|||||||
# so don't link statically there
|
# so don't link statically there
|
||||||
#
|
#
|
||||||
BuildMySQL "--disable-shared \
|
BuildMySQL "--disable-shared \
|
||||||
%ifarch i386
|
%if %{STATIC_BUILD}
|
||||||
--with-mysqld-ldflags='-all-static' \
|
--with-mysqld-ldflags='-all-static' \
|
||||||
--with-client-ldflags='-all-static' \
|
--with-client-ldflags='-all-static' \
|
||||||
$USE_OTHER_LIBC_DIR \
|
$USE_OTHER_LIBC_DIR \
|
||||||
@ -663,6 +667,13 @@ fi
|
|||||||
# itself - note that they must be ordered by date (important when
|
# itself - note that they must be ordered by date (important when
|
||||||
# merging BK trees)
|
# merging BK trees)
|
||||||
%changelog
|
%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>
|
* Mon Jun 06 2005 Lenz Grimmer <lenz@mysql.com>
|
||||||
|
|
||||||
- added mysql_client_test to the "bench" subpackage (BUG 10676)
|
- added mysql_client_test to the "bench" subpackage (BUG 10676)
|
||||||
|
Reference in New Issue
Block a user