Below is the list of changes that have just been committed into a local
4.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.2246 05/05/10 13:53:47 kent@stripped +2 -0
Makefile.am, configure.in:
Enable creation of embedded lib when --with-darwin-mwcc
libmysqld/Makefile.am
1.59 05/05/10 13:53:21 kent@stripped +4 -1
Enable creation of embedded lib when --with-darwin-mwcc
configure.in
1.372 05/05/10 13:53:20 kent@stripped +3 -0
Enable creation of embedded lib when --with-darwin-mwcc
# 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: g4.boortz.dyndns.org
# Root: /Users/kent/mysql/cw/mysql-4.1
--- 1.371/configure.in 2005-05-07 17:35:09 +02:00
+++ 1.372/configure.in 2005-05-10 13:53:20 +02:00
@@ -145,7 +145,10 @@
export CC CXX LD AR RANLIB
AC_SUBST(AR)
AC_SUBST(RANLIB)
+ with_darwin_mwcc=yes
])
+
+AM_CONDITIONAL(DARWIN_MWCC, test x$with_darwin_mwcc = xyes)
if test "x${CFLAGS-}" = x ; then
cflags_is_set=no
--- 1.58/libmysqld/Makefile.am 2005-03-25 23:09:16 +01:00
+++ 1.59/libmysqld/Makefile.am 2005-05-10 13:53:21 +02:00
@@ -83,6 +83,9 @@
# generate a total libmysqld.a from all library files,
libmysqld.a: libmysqld_int.a $(INC_LIB)
+if DARWIN_MWCC
+ mwld -lib -o $@ libmysqld_int.a `ls -1 $(INC_LIB) | sort -u`
+else
if test "$(host_os)" = "netware" ; \
then \
$(libmysqld_a_AR) libmysqld.a libmysqld_int.a $(INC_LIB) ; \
@@ -104,7 +107,7 @@
rm -f tmp/* ; \
$(RANLIB) libmysqld.a ; \
fi
-
+endif
## XXX: any time the client interface changes, we'll need to bump
## the version info for libmysqld; however, it's possible for the
| Thread |
|---|
| • bk commit into 4.1 tree (kent:1.2246) | kent | 10 May |
