Commit 32f5a8eb authored by unknown's avatar unknown
Browse files

Applied patch from Novell (2004-06-03)

parent 8764abf2

mysys/mf_tempfile.c

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ File create_temp_file(char *to, const char *dir, const char *prefix, 
    (*free)(res);

    file=my_create(to, 0, mode, MyFlags);

  }

#elif defined(HAVE_MKSTEMP)

#elif defined(HAVE_MKSTEMP) && !defined(__NETWARE__)

  {

    char prefix_buff[30];

    uint pfx_len;

netware/BUILD/mwenv

+6 −6
Original line number Diff line number Diff line 
#! /bin/sh



# WINE_BUILD_DIR, BUILD_DIR, and VERSION must be correct before compiling

# F:/mydev, /home/kp/mydev, and 4.0.21 must be correct before compiling

# This values are normally changed by the nwbootstrap script



# the default is "F:/mydev"

export MYDEV="WINE_BUILD_DIR"

export MYDEV="F:/mydev"



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

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

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

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

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

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



export WINEPATH="$MYDEV/mw/bin"



# the default added path is "$HOME/mydev/mysql-x.x-x/netware/BUILD"

export PATH="$PATH:BUILD_DIR/mysql-VERSION/netware/BUILD"

export PATH="$PATH:/home/kp/mydev/mysql-4.0.21/netware/BUILD"



export AR='mwldnlm'

export AR_FLAGS='-type library -o'

netware/BUILD/nwbootstrap

+5 −0
Original line number Diff line number Diff line
@@ -176,6 +176,11 @@ done 
echo "generating llibmysql.imp file..."

awk 'BEGIN{x=0;}  x==1 {print $1;next} /EXPORTS/{x=1}' libmysql/libmysql.def > netware/libmysql.imp



# create the libmysql.imp file in netware folder from libmysql/libmysql.def file

echo "generating llibmysql.imp file..."

awk 'BEGIN{x=0;}  x==1 {print $1;next} /EXPORTS/{x=1}' libmysql/libmysql.def > netware/libmysql.imp





# build linux tools

echo "compiling linux tools..."

./netware/BUILD/compile-linux-tools