List:Commits« Previous MessageNext Message »
From:kent Date:February 9 2006 2:12am
Subject:bk commit into 5.1 tree (kent:1.2140)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of kent. When kent 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.2140 06/02/09 03:11:45 kent@stripped +2 -0
  Makefile.am:
    Link with CLIENT_EXTRA_LDFLAGS, enable us to
    pass on libtool flags '-full-static' and '-static'
    using '--with-client-ldflags' to configure.
  mysql.spec.sh:
    Pass '-static' to libtool, link static with our
    own libraries, dynamic with system libraries.
    Link with the bundled zlib.

  server-tools/instance-manager/Makefile.am
    1.30 06/02/09 03:10:10 kent@stripped +2 -1
    Link with CLIENT_EXTRA_LDFLAGS, enable us to
    pass on libtool flags '-full-static' and '-static'
    using '--with-client-ldflags' to configure.

  support-files/mysql.spec.sh
    1.124 06/02/09 03:06:54 kent@stripped +3 -0
    Pass '-static' to libtool, link static with our
    own libraries, dynamic with system libraries.
    Link with the bundled zlib.

# 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:	kent
# Host:	c-754072d5.010-2112-6f72651.cust.bredbandsbolaget.se
# Root:	/Users/kent/mysql/bk/mysql-5.1-release

--- 1.123/support-files/mysql.spec.sh	2006-02-08 11:42:05 +01:00
+++ 1.124/support-files/mysql.spec.sh	2006-02-09 03:06:54 +01:00
@@ -217,6 +217,9 @@
 	CXXFLAGS=\"$CXXFLAGS\" \
 	./configure \
  	    $* \
+	    --with-mysqld-ldflags='-static' \
+	    --with-client-ldflags='-static' \
+	    --with-zlib-dir=bundled \
 	    --enable-assembler \
 	    --enable-local-infile \
             --with-mysqld-user=%{mysqld_user} \

--- 1.29/server-tools/instance-manager/Makefile.am	2005-11-09 10:27:13 +01:00
+++ 1.30/server-tools/instance-manager/Makefile.am	2006-02-09 03:10:10 +01:00
@@ -79,7 +79,8 @@
                         mysql_manager_error.h \
                         portability.h
 
-mysqlmanager_LDADD=	liboptions.a \
+mysqlmanager_LDADD=	@CLIENT_EXTRA_LDFLAGS@ \
+			liboptions.a \
 			libnet.a \
 			$(top_builddir)/vio/libvio.a \
 			$(top_builddir)/mysys/libmysys.a \
Thread
bk commit into 5.1 tree (kent:1.2140)kent9 Feb