From 576fd5a5eee99c15923f39750ffb3a20941be705 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 11 Oct 2006 19:40:55 +0200 Subject: Check that TERM has been set to avoid problem "Error opening terminal: unknown" when the script is executed using non interactive ssh Set TERM to "linux" as default netware/BUILD/mwenv: Check that TERM has been set to avoid problem "Error opening terminal: unknown" when the script is executed using non interactive ssh --- netware/BUILD/mwenv | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'netware') diff --git a/netware/BUILD/mwenv b/netware/BUILD/mwenv index d8d53293b2c..dd055ad8270 100755 --- a/netware/BUILD/mwenv +++ b/netware/BUILD/mwenv @@ -46,3 +46,13 @@ export LD='mwldnlm' export LDFLAGS='-entry _LibCPrelude -exit _LibCPostlude -map -flags pseudopreemption' export RANLIB=: export STRIP=: + +# +# Check that TERM has been set to avoid problem "Error opening +# terminal: unknown" when the script is executed using non interactive ssh +# +if test -z "$TERM" -o "$TERM"=dumb +then + export TERM=linux +fi + -- cgit v1.2.1 From aed3bd413ddf4bd90085318f80daf74a7cea37e1 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 12 Oct 2006 12:11:23 +0200 Subject: Switch to use yaSSL instead of OpenSSL on Netware --- netware/BUILD/compile-netware-max | 2 +- netware/BUILD/compile-netware-max-debug | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'netware') diff --git a/netware/BUILD/compile-netware-max b/netware/BUILD/compile-netware-max index ec737d4615c..3286c3c693b 100644 --- a/netware/BUILD/compile-netware-max +++ b/netware/BUILD/compile-netware-max @@ -15,7 +15,7 @@ suffix="max" extra_configs=" \ --with-innodb \ --with-embedded-server \ - --with-openssl \ + --with-yassl \ " . $path/compile-netware-END diff --git a/netware/BUILD/compile-netware-max-debug b/netware/BUILD/compile-netware-max-debug index ea3553ae6e1..e3155cbd7d7 100644 --- a/netware/BUILD/compile-netware-max-debug +++ b/netware/BUILD/compile-netware-max-debug @@ -15,7 +15,7 @@ extra_configs=" \ --with-innodb \ --with-debug=full \ --with-embedded-server \ - --with-openssl \ + --with-yassl \ " . $path/compile-netware-END -- cgit v1.2.1 From a1a0b3deabf4f8415ca1361f3ce12bfb5cab5b85 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 12 Oct 2006 12:14:50 +0200 Subject: Only one switch for ssl(--with-ssl) in 5.1 --- netware/BUILD/compile-netware-max | 2 +- netware/BUILD/compile-netware-max-debug | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'netware') diff --git a/netware/BUILD/compile-netware-max b/netware/BUILD/compile-netware-max index 3286c3c693b..d8278a4e915 100644 --- a/netware/BUILD/compile-netware-max +++ b/netware/BUILD/compile-netware-max @@ -15,7 +15,7 @@ suffix="max" extra_configs=" \ --with-innodb \ --with-embedded-server \ - --with-yassl \ + --with-ssl \ " . $path/compile-netware-END diff --git a/netware/BUILD/compile-netware-max-debug b/netware/BUILD/compile-netware-max-debug index e3155cbd7d7..de1b5dd17cc 100644 --- a/netware/BUILD/compile-netware-max-debug +++ b/netware/BUILD/compile-netware-max-debug @@ -15,7 +15,7 @@ extra_configs=" \ --with-innodb \ --with-debug=full \ --with-embedded-server \ - --with-yassl \ + --with-ssl \ " . $path/compile-netware-END -- cgit v1.2.1 From c5cebf205f9eae1d9e94ee2477fab12a3fee432f Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 12 Oct 2006 13:28:18 +0200 Subject: Use libc-2003 if available else default to libc --- netware/BUILD/mwenv | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'netware') diff --git a/netware/BUILD/mwenv b/netware/BUILD/mwenv index dd055ad8270..bc797c442ab 100755 --- a/netware/BUILD/mwenv +++ b/netware/BUILD/mwenv @@ -26,8 +26,17 @@ WINE_BUILD_DIR=`echo "$BUILD_DIR" | sed 's_'$base_unix_part'/__'` WINE_BUILD_DIR="$base/$WINE_BUILD_DIR" echo "WINE_BUILD_DIR: $WINE_BUILD_DIR" -export MWCNWx86Includes="$MYDEV/libc/include;$MYDEV/fs64/headers;$MYDEV/zlib-1.2.3;$WINE_BUILD_DIR/include;$MYDEV" -export MWNWx86Libraries="$MYDEV/libc/imports;$MYDEV/mw/lib;$MYDEV/fs64/imports;$MYDEV/zlib-1.2.3;$MYDEV/openssl;$WINE_BUILD_DIR/netware/BUILD" +# Look for libc, MySQL 5.0.x uses libc-2003 by default +libcdir="$MYDEV/libc-2003" +if test ! -d $libcdir +then + # The libcdir didn't exist, set default + libc_dir="$MYDEV/libc" +fi +echo "Using libc in $libc_dir"; + +export MWCNWx86Includes="$libc_dir/include;$MYDEV/fs64/headers;$MYDEV/zlib-1.2.3;$WINE_BUILD_DIR/include;$MYDEV" +export MWNWx86Libraries="$libc_dir/imports;$MYDEV/mw/lib;$MYDEV/fs64/imports;$MYDEV/zlib-1.2.3;$MYDEV/openssl;$WINE_BUILD_DIR/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" @@ -56,3 +65,5 @@ then export TERM=linux fi +# Print all env. variables +export -- cgit v1.2.1 From 3fb85dcad140fc23137525729868f0f519871964 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 12 Oct 2006 13:31:41 +0200 Subject: 5.1 should use libc-2006 by default --- netware/BUILD/mwenv | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'netware') diff --git a/netware/BUILD/mwenv b/netware/BUILD/mwenv index bc797c442ab..c3869d2ec90 100755 --- a/netware/BUILD/mwenv +++ b/netware/BUILD/mwenv @@ -26,8 +26,8 @@ WINE_BUILD_DIR=`echo "$BUILD_DIR" | sed 's_'$base_unix_part'/__'` WINE_BUILD_DIR="$base/$WINE_BUILD_DIR" echo "WINE_BUILD_DIR: $WINE_BUILD_DIR" -# Look for libc, MySQL 5.0.x uses libc-2003 by default -libcdir="$MYDEV/libc-2003" +# Look for libc, MySQL 5.1.x uses libc-2006 by default +libcdir="$MYDEV/libc-2006" if test ! -d $libcdir then # The libcdir didn't exist, set default -- cgit v1.2.1 From dd519d114ab402b944f9f50feeff5f268b780097 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 12 Oct 2006 14:14:54 +0200 Subject: Make all compile-netware-* scripts executable netware/BUILD/compile-netware-max: Change mode to -rwxrwxr-x netware/BUILD/compile-netware-max-debug: Change mode to -rwxrwxr-x netware/BUILD/compile-netware-src: Change mode to -rwxrwxr-x --- netware/BUILD/compile-netware-max | 0 netware/BUILD/compile-netware-max-debug | 0 netware/BUILD/compile-netware-src | 0 3 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 netware/BUILD/compile-netware-max mode change 100644 => 100755 netware/BUILD/compile-netware-max-debug mode change 100644 => 100755 netware/BUILD/compile-netware-src (limited to 'netware') diff --git a/netware/BUILD/compile-netware-max b/netware/BUILD/compile-netware-max old mode 100644 new mode 100755 diff --git a/netware/BUILD/compile-netware-max-debug b/netware/BUILD/compile-netware-max-debug old mode 100644 new mode 100755 diff --git a/netware/BUILD/compile-netware-src b/netware/BUILD/compile-netware-src old mode 100644 new mode 100755 -- cgit v1.2.1