diff options
| author | unknown <jani@a193-229-222-105.elisa-laajakaista.fi> | 2005-12-13 18:30:10 +0200 |
|---|---|---|
| committer | unknown <jani@a193-229-222-105.elisa-laajakaista.fi> | 2005-12-13 18:30:10 +0200 |
| commit | 120466962061ba50d5de5326258c15848bcc2910 (patch) | |
| tree | 6aa9e75ff46f35e765edb4f3db321cc710d5dfd5 | |
| parent | 4fc6562f6604dca883e6cc7df894b25f976c3ce4 (diff) | |
| download | mariadb-git-120466962061ba50d5de5326258c15848bcc2910.tar.gz | |
Minor Netware specific changes.
netware/BUILD/compile-linux-tools:
Fixed compilation problem with Linux tools.
scripts/make_binary_distribution.sh:
Netware specific changes. Discard platform
specific files and added a couple of missing files.
sql/tztime.cc:
Code not ported to Netware yet.
| -rwxr-xr-x | netware/BUILD/compile-linux-tools | 5 | ||||
| -rw-r--r-- | scripts/make_binary_distribution.sh | 4 | ||||
| -rw-r--r-- | sql/tztime.cc | 5 |
3 files changed, 12 insertions, 2 deletions
diff --git a/netware/BUILD/compile-linux-tools b/netware/BUILD/compile-linux-tools index 744bb1d4c3d..c67830be7ed 100755 --- a/netware/BUILD/compile-linux-tools +++ b/netware/BUILD/compile-linux-tools @@ -28,7 +28,8 @@ rm -f */*.linux ./configure --without-innodb --without-docs # build tools only -make clean all-local +make clean +make (cd dbug; make libdbug.a) (cd strings; make libmystrings.a) (cd mysys; make libmysys.a) @@ -53,7 +54,7 @@ make clean all-local # copying required linux tools cp extra/comp_err extra/comp_err.linux cp libmysql/conf_to_src libmysql/conf_to_src.linux -cp libmysql_r/conf_to_src libmysql_r/conf_to_src.linux +#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 diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh index c00ba1c6f57..3c16937e158 100644 --- a/scripts/make_binary_distribution.sh +++ b/scripts/make_binary_distribution.sh @@ -177,6 +177,7 @@ if [ $BASE_SYSTEM = "netware" ] ; then libname=`basename $i .a` $MV $i $BASE/lib/$libname.lib done + rm -f $BASE/lib/*.la fi copyfileto $BASE/include config.h include/* @@ -266,6 +267,9 @@ if [ $BASE_SYSTEM = "netware" ] ; then $BASE/support-files/mysql*.spec \ $BASE/support-files/mysql-log-rotate \ $BASE/support-files/binary-configure \ + $BASE/support-files/build-tags \ + $BASE/support-files/MySQL-shared-compat.spec \ + $BASE/support-files/ndb-config-2-node.ini \ $BASE/INSTALL-BINARY \ $BASE/MySQLEULA.txt else diff --git a/sql/tztime.cc b/sql/tztime.cc index b5ebc9f350a..b0a32748998 100644 --- a/sql/tztime.cc +++ b/sql/tztime.cc @@ -2359,6 +2359,7 @@ scan_tz_dir(char * name_end) int main(int argc, char **argv) { +#ifndef __NETWARE__ MY_INIT(argv[0]); if (argc != 2 && argc != 3) @@ -2417,6 +2418,10 @@ main(int argc, char **argv) free_root(&tz_storage, MYF(0)); } +#else + fprintf(stderr, "This tool has not been ported to NetWare\n"); +#endif /* __NETWARE__ */ + return 0; } |