Commit 9d5e2e91 authored by unknown's avatar unknown
Browse files

Some fixes for Netware builds. 



netware/BUILD/compile-linux-tools:
  A patch for Netware builds. This fixes problem with missing mysql_version.h during Linux
  tools building.
netware/BUILD/compile-netware-END:
  A fix for Netware builds.
netware/BUILD/mwenv:
  A fix for Netware builds, environment variables setup script.
parent 4e125645

netware/BUILD/compile-linux-tools

+6 −0
Original line number Diff line number Diff line
@@ -30,6 +30,10 @@ rm -f */*.linux 


# build	tools only

make clean all-local



# Create mysql_version.h which was deleted my previous step

./config.status include/mysql_version.h

                                                                                                                             

(cd dbug; make libdbug.a)

(cd strings; make libmystrings.a)

(cd mysys; make libmysys.a)
@@ -56,3 +60,5 @@ cp libmysql_r/conf_to_src libmysql_r/conf_to_src.linux 
cp sql/gen_lex_hash sql/gen_lex_hash.linux

cp strings/conf_to_src strings/conf_to_src.linux



# Delete mysql_version.h

rm -f include/mysql_version.h

netware/BUILD/compile-netware-END

+5 −0
Original line number Diff line number Diff line
@@ -22,6 +22,11 @@ rm -rf Makefile.in.bk 
# run auto tools

. $path/compile-AUTOTOOLS



# For NetWare there is no comp_err but comp_err.linux

sed -e "s/comp_err/comp_err.linux/g" extra/Makefile.am > extra/Makefile.am.$$

sed -e "s/replace comp_err.linux/replace comp_err/g" extra/Makefile.am.$$ > extra/Makefile.am

rm extra/Makefile.am.$$



# configure

./configure $base_configs $extra_configs

netware/BUILD/mwenv

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
# the default is "F:/mydev"

export MYDEV="F:/mydev"



export MWCNWx86Includes="$MYDEV/libc/include;$MYDEV/fs64/headers;$MYDEV/zlib-1.1.4;$MYDEV"

export MWCNWx86Includes="$MYDEV/libc/include;$MYDEV/fs64/headers;$MYDEV/zlib-1.1.4;$MYDEV/mysql-VERSION/include;$MYDEV"

export MWNWx86Libraries="$MYDEV/libc/imports;$MYDEV/mw/lib;$MYDEV/fs64/imports;$MYDEV/zlib-1.1.4;$MYDEV/openssl;$MYDEV/mysql-VERSION/netware/BUILD"

export MWNWx86LibraryFiles="libcpre.o;libc.imp;netware.imp;mwcrtl.lib;mwcpp.lib;libz.a;neb.imp;zPublics.imp;knetware.imp"