Various tool fixes, necessary to build 5.1.12-beta on Netware.
netware/BUILD/compile-AUTOTOOLS: Fixes for Netware builds: 1) The "autotools" used there have problems with changing variables in Makefiles after the initial setting. 2) "storage/innobase" does not need an autotool run any more. 3) "automake --verbose" may be able to help if new problems arise. netware/BUILD/compile-netware-START: The CSV engine is now mandatory in 5.1, must not be de-configured. netware/BUILD/mwenv: When testing for a possibly empty shell variable, it is mandatory to use quotes! netware/BUILD/nwbootstrap: The "mwenv" file has been changed, reflect these changes here: 1) It is no longer necessary to set the variables WINE_BUILD_DIR, BUILD_DIR, and VERSION. 2) The handling of MYDEV there has changed, the "export" line may be indented.
This commit is contained in:
parent
1f0c83c187
commit
d41b34bf95
@ -5,8 +5,11 @@
|
||||
|
||||
# stop on errors
|
||||
set -e
|
||||
sed -e "s/^DIST_COMMON/#DIST_COMMON/g" storage/ndb/Makefile.am > storage/ndb/Makefile.am.$$
|
||||
mv storage/ndb/Makefile.am.$$ storage/ndb/Makefile.am
|
||||
|
||||
for package in . ./storage/innobase
|
||||
# for package in . ./storage/innobase
|
||||
for package in .
|
||||
do
|
||||
(cd $package
|
||||
rm -rf config.cache autom4te.cache
|
||||
@ -14,6 +17,7 @@ do
|
||||
autoheader
|
||||
libtoolize --force
|
||||
aclocal
|
||||
# automake --verbose --add-missing --force-missing
|
||||
automake --add-missing --force-missing
|
||||
autoconf)
|
||||
done
|
||||
|
@ -24,5 +24,4 @@ base_configs=" \
|
||||
--prefix=N:/mysql \
|
||||
--without-mysqlmanager \
|
||||
--without-man \
|
||||
--without-csv-storage-engine \
|
||||
"
|
||||
|
@ -8,7 +8,7 @@ fi
|
||||
|
||||
# The base path(in wineformat) where compilers, includes and
|
||||
# libraries are installed
|
||||
if test -z $MYDEV
|
||||
if test -z "$MYDEV"
|
||||
then
|
||||
# the default is "F:/mydev"
|
||||
export MYDEV="F:/mydev"
|
||||
|
@ -151,17 +151,18 @@ echo "making files writable..."
|
||||
cd $target_dir
|
||||
chmod -R u+rw,g+rw .
|
||||
|
||||
# edit the mvenv file
|
||||
echo "updating the mwenv environment file..."
|
||||
## # edit the mvenv file
|
||||
## echo "updating the mwenv environment file..."
|
||||
mwenv="./netware/BUILD/mwenv"
|
||||
mv -f $mwenv $mwenv.org
|
||||
sed -e "s;WINE_BUILD_DIR;$wine_build_dir;g" \
|
||||
-e "s;BUILD_DIR;$build_dir;g" \
|
||||
-e "s;VERSION;$version;g" $mwenv.org > $mwenv
|
||||
chmod +rwx $mwenv
|
||||
## mv -f $mwenv $mwenv.org
|
||||
## sed -e "s;WINE_BUILD_DIR;$wine_build_dir;g" \
|
||||
## -e "s;BUILD_DIR;$build_dir;g" \
|
||||
## -e "s;VERSION;$version;g" $mwenv.org > $mwenv
|
||||
## chmod +rwx $mwenv
|
||||
|
||||
PWD=`pwd`
|
||||
SRC_DIR=`grep "^export MYDEV=" $mwenv | cut -d'=' -f2 | \
|
||||
# This line will catch the default value only, let's hope it is correct
|
||||
SRC_DIR=`grep "^ *export MYDEV=" $mwenv | cut -d'=' -f2 | \
|
||||
sed -e 's;";;g' -e "s;^;echo ;g" -e "s;$;/\`basename $PWD\`;g" | /bin/sh`
|
||||
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user