mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 05:52:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1

Browse source 
into mysql.com:/space/my/mysql-4.1
This commit is contained in:
lenz@mysql.com 2005-06-17 11:33:42 +02:00
commit 9fd870a7ee
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
support-files/mysql.spec.sh
View file

@ -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)