database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Fix for mit-pthreads on linux

Browse Source
This commit is contained in:
monty@work.mysql.com
2000-08-30 23:52:33 +02:00
parent 454044ac9e
commit 05cfce9fe5
4 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Build-tools/Do-all-build-steps
View File

@ -1,6 +1,7 @@
#!/bin/bash #!/bin/bash
WD=`pwd` WD=`pwd`
# Don't write a wrong path for BD !!!!!
BD=/my/tmp/BUILD BD=/my/tmp/BUILD
TMP_SCRIPT=$WD/Logs/00-temp-for-do-all-build-steps.$$ TMP_SCRIPT=$WD/Logs/00-temp-for-do-all-build-steps.$$
@ -12,6 +13,7 @@ EXTRA_CONFIG="--without-perl"
echo "Building on $to_host" echo "Building on $to_host"
rm -rf $BD/*
mkdir -p $WD/Logs mkdir -p $WD/Logs
mkdir -p $BD/Logs mkdir -p $BD/Logs
@ -22,9 +24,12 @@ set -x
cd "$WD" cd "$WD"
# Create a build directory tree # Create a build directory tree
bk export -w $BD 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" cd "$BD"
#Make it easy to remove an old build
umask 002
CC=$cc CXX=$ccc CC=$cc CXX=$ccc
export CC CXX export CC CXX
@ -51,7 +56,8 @@ aclocal; autoheader; aclocal; automake; autoconf
./configure \ ./configure \
--with-unix-socket-path=/var/tmp/mysql.sock \ --with-unix-socket-path=/var/tmp/mysql.sock \
--with-low-memory \ --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. gmake # --jobs=4 does not work.
@ -77,5 +83,6 @@ fi
# Create a commercial MySQL distribution (mysqlcom-VER.tar.gz) from # Create a commercial MySQL distribution (mysqlcom-VER.tar.gz) from
# the newly made source distribution # the newly made source distribution
cd "$BD"
DIST=`ls -t mysql-*.tar.gz | head -1` DIST=`ls -t mysql-*.tar.gz | head -1`
sh $BD/Build-tools/mysql-copyright --target=. $DIST $BD/Build-tools/mysql-copyright --target=. $DIST

2
libmysql/Makefile.am
View File

@ -20,6 +20,8 @@
target = libmysqlclient.la target = libmysqlclient.la
target_defs = -DUNDEF_THREADS_HACK target_defs = -DUNDEF_THREADS_HACK
LIBS = @CLIENT_LIBS@ LIBS = @CLIENT_LIBS@
INCLUDES = -I$(srcdir)/../include -I../include \
-I$(srcdir)/.. -I$(top_srcdir) -I..
include $(srcdir)/Makefile.shared include $(srcdir)/Makefile.shared

2
libmysql/Makefile.shared
View File

@ -20,8 +20,6 @@
MYSQLDATAdir = $(localstatedir) MYSQLDATAdir = $(localstatedir)
MYSQLSHAREdir = $(pkgdatadir) MYSQLSHAREdir = $(pkgdatadir)
MYSQLBASEdir= $(prefix) 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 ## We'll use CLIENT_EXTRA_LDFLAGS for threaded and non-threaded
## until someone complains that they need separate options. ## until someone complains that they need separate options.
LDADD = @CLIENT_EXTRA_LDFLAGS@ $(target) LDADD = @CLIENT_EXTRA_LDFLAGS@ $(target)

5
libmysql_r/Makefile.am
View File

@ -15,12 +15,15 @@
# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
# MA 02111-1307, USA # MA 02111-1307, USA
# This file is public domain and comes with NO WARRANTY of any kind
target = libmysqlclient_r.la target = libmysqlclient_r.la
target_defs = target_defs =
## LIBS = @LIBS@ ## 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 ## automake barfs if you don't use $(srcdir) or $(top_srcdir) in include
include $(top_srcdir)/libmysql/Makefile.shared include $(top_srcdir)/libmysql/Makefile.shared