mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-21 15:55:53 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint

Browse source 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


include/mysql.h:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
netware/BUILD/compile-netware-END:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
vio/viossl.c:
  Auto merged
vio/viosslfactories.c:
  Auto merged
netware/BUILD/mwenv:
  Merge
This commit is contained in:
unknown 2006-10-24 12:53:47 +02:00
commit 8247821b38
8 changed files with 162 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

9
netware/BUILD/compile-netware-END
View file

@ -18,8 +18,13 @@ rm -rf Makefile.in.bk
# Setup Metrowerks environment
. $path/mwenv
# Run autotools(use BUILD/autorun.sh)
. BUILD/autorun.sh
# Temporary hack to allow building from source dist
if [ ! "$USER"=pushbuild ]
then
# Run autotools(use BUILD/autorun.sh)
echo "Running autotools again(BUILD/autorun.sh)"
. BUILD/autorun.sh
fi
# configure
./configure $base_configs $extra_configs

10
netware/BUILD/mwenv
View file

@ -27,8 +27,8 @@ WINE_BUILD_DIR="$base/$WINE_BUILD_DIR"
echo "WINE_BUILD_DIR: $WINE_BUILD_DIR"
# Look for libc, MySQL 5.1.x uses libc-2006 by default
libcdir="$MYDEV/libc-2006"
if test ! -d $libcdir
libc_dir="$MYDEV/libc-2006"
if [ ! -d `winepath $libc_dir` ]
then
# The libcdir didn't exist, set default
libc_dir="$MYDEV/libc"
@ -65,5 +65,11 @@ then
export TERM=linux
fi
# Temporary hack to allow building from source dist
if [ "$USER"=pushbuild ]
then
export ARFLAGS=$AR_FLAGS
fi
# Print all env. variables
export