Commit 05cfce9f authored by monty@work.mysql.com's avatar monty@work.mysql.com

Fix for mit-pthreads on linux

parent 454044ac
#!/bin/bash
WD=`pwd`
# Don't write a wrong path for BD !!!!!
BD=/my/tmp/BUILD
TMP_SCRIPT=$WD/Logs/00-temp-for-do-all-build-steps.$$
......@@ -12,6 +13,7 @@ EXTRA_CONFIG="--without-perl"
echo "Building on $to_host"
rm -rf $BD/*
mkdir -p $WD/Logs
mkdir -p $BD/Logs
......@@ -22,9 +24,12 @@ set -x
cd "$WD"
# Create a build directory tree
bk export -w $BD
chmod a+x $BD/mit-pthreads/config/configure
chmod a+x $BD/mit-pthreads/config/configure $BD/Build-tools/* $BD/tests/*.pl
cd "$BD"
#Make it easy to remove an old build
umask 002
CC=$cc CXX=$ccc
export CC CXX
......@@ -51,7 +56,8 @@ aclocal; autoheader; aclocal; automake; autoconf
./configure \
--with-unix-socket-path=/var/tmp/mysql.sock \
--with-low-memory \
--with-mit-threads=yes $EXTRA_CONFIG
--with-mit-threads=yes $EXTRA_CONFIG \
--enable-thread-safe-client
gmake # --jobs=4 does not work.
......@@ -77,5 +83,6 @@ fi
# Create a commercial MySQL distribution (mysqlcom-VER.tar.gz) from
# the newly made source distribution
cd "$BD"
DIST=`ls -t mysql-*.tar.gz | head -1`
sh $BD/Build-tools/mysql-copyright --target=. $DIST
$BD/Build-tools/mysql-copyright --target=. $DIST
......@@ -20,6 +20,8 @@
target = libmysqlclient.la
target_defs = -DUNDEF_THREADS_HACK
LIBS = @CLIENT_LIBS@
INCLUDES = -I$(srcdir)/../include -I../include \
-I$(srcdir)/.. -I$(top_srcdir) -I..
include $(srcdir)/Makefile.shared
......
......@@ -20,8 +20,6 @@
MYSQLDATAdir = $(localstatedir)
MYSQLSHAREdir = $(pkgdatadir)
MYSQLBASEdir= $(prefix)
INCLUDES = -I$(srcdir)/../include -I../include \
-I$(srcdir)/.. -I$(top_srcdir) -I..
## We'll use CLIENT_EXTRA_LDFLAGS for threaded and non-threaded
## until someone complains that they need separate options.
LDADD = @CLIENT_EXTRA_LDFLAGS@ $(target)
......
......@@ -15,12 +15,15 @@
# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
# MA 02111-1307, USA
# This file is public domain and comes with NO WARRANTY of any kind
target = libmysqlclient_r.la
target_defs =
## LIBS = @LIBS@
INCLUDES = @MT_INCLUDES@ -I$(srcdir)/../include -I../include \
-I$(srcdir)/.. -I$(top_srcdir) -I..
## automake barfs if you don't use $(srcdir) or $(top_srcdir) in include
include $(top_srcdir)/libmysql/Makefile.shared
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment