bk commit into 5.1 tree (lenz:1.1885)

[lenz]

Below is the list of changes that have just been committed into a local
5.1 repository of lenz. When lenz does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1885 05/06/15 12:48:08 lenz@stripped +1 -0
  Merge mysql.com:/space/my/mysql-5.0 into mysql.com:/space/my/mysql-5.1

  support-files/mysql.spec.sh
    1.105 05/06/15 12:48:06 lenz@stripped +0 -0
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	lenz
# Host:	metis.lenznet
# Root:	/space/my/mysql-5.1/RESYNC

--- 1.104/support-files/mysql.spec.sh	2005-06-13 15:16:12 +02:00
+++ 1.105/support-files/mysql.spec.sh	2005-06-15 12:48:06 +02:00
@@ -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 @@
 # 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 @@
 # itself - note that they must be ordered by date (important when
 # merging BK trees)
 %changelog 
+* Tue Jun 14 2005 Lenz Grimmer <lenz@stripped>
+
+- 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@stripped>
 
 - added mysql_client_test to the "bench" subpackage (BUG 10676)