From cad422afb7a4dcd7592c502641b41a832703e536 Mon Sep 17 00:00:00 2001 From: Fridrich Štrba Date: Wed, 6 Mar 2013 16:33:07 +0100 Subject: Adding libmariadb module for internal mariadb (work in progress) Change-Id: If2cf9ff21120e29a149903e8eab849d97fa0c2c9 --- libmariadb/ExternalPackage_libmariadb.mk | 51 ++++++ libmariadb/Module_libmariadb.mk | 22 +++ libmariadb/StaticLibrary_mariadb.mk | 117 +++++++++++++ libmariadb/UnpackedTarball_mariadb.mk | 17 ++ libmariadb/my_config.h | 277 +++++++++++++++++++++++++++++++ libmariadb/mysql_version.h | 24 +++ libmariadb/prj/build.lst | 2 + 7 files changed, 510 insertions(+) create mode 100644 libmariadb/ExternalPackage_libmariadb.mk create mode 100644 libmariadb/Module_libmariadb.mk create mode 100644 libmariadb/StaticLibrary_mariadb.mk create mode 100644 libmariadb/UnpackedTarball_mariadb.mk create mode 100644 libmariadb/my_config.h create mode 100644 libmariadb/mysql_version.h create mode 100644 libmariadb/prj/build.lst (limited to 'libmariadb') diff --git a/libmariadb/ExternalPackage_libmariadb.mk b/libmariadb/ExternalPackage_libmariadb.mk new file mode 100644 index 000000000000..29b907f38c1f --- /dev/null +++ b/libmariadb/ExternalPackage_libmariadb.mk @@ -0,0 +1,51 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_ExternalPackage_ExternalPackage,libmariadb_inc,mariadb)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,libmariadb_inc,inc/external/libmariadb,\ + include/config-win.h \ + include/dbug.h \ + include/errmsg.h \ + include/getopt.h \ + include/global.h \ + include/hash.h \ + include/m_ctype.h \ + include/m_string.h \ + include/my_alarm.h \ + include/my_base.h \ + include/my_dir.h \ + include/my_global.h \ + include/my_list.h \ + include/my_net.h \ + include/my_no_pthread.h \ + include/my_pthread.h \ + include/my_secure.h \ + include/mysql_com.h \ + include/mysqld_error.h \ + include/mysql.h \ + include/mysql_io.h \ + include/mysql_mm.h \ + include/mysql_priv.h \ + include/mysql_wireprotocol.h \ + include/my_stmt.h \ + include/mysys_err.h \ + include/my_sys.h \ + include/sha1.h \ + include/thr_alarm.h \ + include/violite.h \ +)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,libmariadb_inc,inc/external/libmariadb/mysql,\ + include/mysql/client_plugin.h \ + include/mysql/plugin_auth_common.h \ + include/mysql/plugin_auth.h \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/libmariadb/Module_libmariadb.mk b/libmariadb/Module_libmariadb.mk new file mode 100644 index 000000000000..667d55d88212 --- /dev/null +++ b/libmariadb/Module_libmariadb.mk @@ -0,0 +1,22 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_Module_Module,libmariadb)) + +ifeq ($(SYSTEM_MARIADB),NO) + +$(eval $(call gb_Module_add_targets,libmariadb,\ + ExternalPackage_libmariadb \ + StaticLibrary_mariadb \ + UnpackedTarball_mariadb \ +)) + +endif + +# vim: set noet sw=4 ts=4: diff --git a/libmariadb/StaticLibrary_mariadb.mk b/libmariadb/StaticLibrary_mariadb.mk new file mode 100644 index 000000000000..3a22433a81ff --- /dev/null +++ b/libmariadb/StaticLibrary_mariadb.mk @@ -0,0 +1,117 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_StaticLibrary_StaticLibrary,mariadblib)) + +$(eval $(call gb_StaticLibrary_set_warnings_not_errors,mariadblib)) + +$(eval $(call gb_StaticLibrary_use_unpacked,mariadblib,mariadb)) + +$(eval $(call gb_StaticLibrary_use_package,mariadblib,libmariadb_inc)) + +$(eval $(call gb_StaticLibrary_set_generated_c_suffix,mariadblib,c)) + +$(eval $(call gb_StaticLibrary_set_include,mariadblib,\ + $$(INCLUDE) \ + -I$(call gb_UnpackedTarball_get_dir,mariadb)/include \ +)) + +$(eval $(call gb_StaticLibrary_add_defs,mariadblib,\ + -DTHREAD \ +)) + +$(eval $(call gb_StaticLibrary_add_generated_cobjects,mariadblib,\ + UnpackedTarball/mariadb/libmysql/array \ + UnpackedTarball/mariadb/libmysql/bchange \ + UnpackedTarball/mariadb/libmysql/bmove \ + UnpackedTarball/mariadb/libmysql/bmove_upp \ + UnpackedTarball/mariadb/libmysql/charset \ + UnpackedTarball/mariadb/libmysql/client_plugin \ + UnpackedTarball/mariadb/libmysql/dbug \ + UnpackedTarball/mariadb/libmysql/default \ + UnpackedTarball/mariadb/libmysql/errmsg \ + UnpackedTarball/mariadb/libmysql/errors \ + UnpackedTarball/mariadb/libmysql/getopt \ + UnpackedTarball/mariadb/libmysql/getopt1 \ + UnpackedTarball/mariadb/libmysql/get_password \ + UnpackedTarball/mariadb/libmysql/int2str \ + UnpackedTarball/mariadb/libmysql/is_prefix \ + UnpackedTarball/mariadb/libmysql/libmysql \ + UnpackedTarball/mariadb/libmysql/list \ + UnpackedTarball/mariadb/libmysql/llstr \ + UnpackedTarball/mariadb/libmysql/longlong2str \ + UnpackedTarball/mariadb/libmysql/mf_dirname \ + UnpackedTarball/mariadb/libmysql/mf_fn_ext \ + UnpackedTarball/mariadb/libmysql/mf_format \ + UnpackedTarball/mariadb/libmysql/mf_loadpath \ + UnpackedTarball/mariadb/libmysql/mf_pack \ + UnpackedTarball/mariadb/libmysql/mf_path \ + UnpackedTarball/mariadb/libmysql/mf_tempfile \ + UnpackedTarball/mariadb/libmysql/mf_unixpath \ + UnpackedTarball/mariadb/libmysql/mf_wcomp \ + UnpackedTarball/mariadb/libmysql/mulalloc \ + UnpackedTarball/mariadb/libmysql/my_alloc \ + UnpackedTarball/mariadb/libmysql/my_auth \ + UnpackedTarball/mariadb/libmysql/my_charset \ + UnpackedTarball/mariadb/libmysql/my_compress \ + UnpackedTarball/mariadb/libmysql/my_create \ + UnpackedTarball/mariadb/libmysql/my_delete \ + UnpackedTarball/mariadb/libmysql/my_div \ + UnpackedTarball/mariadb/libmysql/my_error \ + UnpackedTarball/mariadb/libmysql/my_fopen \ + UnpackedTarball/mariadb/libmysql/my_fstream \ + UnpackedTarball/mariadb/libmysql/my_gethostbyname \ + UnpackedTarball/mariadb/libmysql/my_getwd \ + UnpackedTarball/mariadb/libmysql/my_init \ + UnpackedTarball/mariadb/libmysql/my_lib \ + UnpackedTarball/mariadb/libmysql/my_loaddata \ + UnpackedTarball/mariadb/libmysql/my_malloc \ + UnpackedTarball/mariadb/libmysql/my_messnc \ + UnpackedTarball/mariadb/libmysql/my_net \ + UnpackedTarball/mariadb/libmysql/my_once \ + UnpackedTarball/mariadb/libmysql/my_open \ + UnpackedTarball/mariadb/libmysql/my_port \ + UnpackedTarball/mariadb/libmysql/my_pthread \ + UnpackedTarball/mariadb/libmysql/my_read \ + UnpackedTarball/mariadb/libmysql/my_realloc \ + UnpackedTarball/mariadb/libmysql/my_secure \ + UnpackedTarball/mariadb/libmysql/my_seek \ + UnpackedTarball/mariadb/libmysql/my_static \ + UnpackedTarball/mariadb/libmysql/my_stmt \ + UnpackedTarball/mariadb/libmysql/my_stmt_codec \ + UnpackedTarball/mariadb/libmysql/my_symlink \ + UnpackedTarball/mariadb/libmysql/my_thr_init \ + UnpackedTarball/mariadb/libmysql/my_vsnprintf \ + UnpackedTarball/mariadb/libmysql/my_write \ + UnpackedTarball/mariadb/libmysql/net \ + UnpackedTarball/mariadb/libmysql/password \ + UnpackedTarball/mariadb/libmysql/safemalloc \ + UnpackedTarball/mariadb/libmysql/sha1 \ + UnpackedTarball/mariadb/libmysql/str2int \ + UnpackedTarball/mariadb/libmysql/strcend \ + UnpackedTarball/mariadb/libmysql/strcont \ + UnpackedTarball/mariadb/libmysql/strend \ + UnpackedTarball/mariadb/libmysql/strfill \ + UnpackedTarball/mariadb/libmysql/string \ + UnpackedTarball/mariadb/libmysql/strinstr \ + UnpackedTarball/mariadb/libmysql/strmake \ + UnpackedTarball/mariadb/libmysql/strmov \ + UnpackedTarball/mariadb/libmysql/strnlen \ + UnpackedTarball/mariadb/libmysql/strnmov \ + UnpackedTarball/mariadb/libmysql/strto \ + UnpackedTarball/mariadb/libmysql/strtoll \ + UnpackedTarball/mariadb/libmysql/strtoull \ + UnpackedTarball/mariadb/libmysql/strxmov \ + UnpackedTarball/mariadb/libmysql/strxnmov \ + UnpackedTarball/mariadb/libmysql/thr_mutex \ + UnpackedTarball/mariadb/libmysql/typelib \ + UnpackedTarball/mariadb/libmysql/violite \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/libmariadb/UnpackedTarball_mariadb.mk b/libmariadb/UnpackedTarball_mariadb.mk new file mode 100644 index 000000000000..75ed7c622098 --- /dev/null +++ b/libmariadb/UnpackedTarball_mariadb.mk @@ -0,0 +1,17 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_UnpackedTarball_UnpackedTarball,mariadb)) + +$(eval $(call gb_UnpackedTarball_set_tarball,mariadb,$(MARIADB_TARBALL))) + +$(eval $(call gb_UnpackedTarball_add_file,mariadb,include/my_config.h,libmariadb/my_config.h)) +$(eval $(call gb_UnpackedTarball_add_file,mariadb,include/mysql_version.h,libmariadb/mysql_version.h)) + +# vim: set noet sw=4 ts=4: diff --git a/libmariadb/my_config.h b/libmariadb/my_config.h new file mode 100644 index 000000000000..bdf86b334ddb --- /dev/null +++ b/libmariadb/my_config.h @@ -0,0 +1,277 @@ + +#define HAVE_GETHOSTBYNAME_R_GLIBC2_STYLE 1 + +/* + * Include file constants (processed in LibmysqlIncludeFiles.txt 1 + */ +#define HAVE_ALLOCA_H 1 +#define HAVE_ARPA_INET_H 1 +#define HAVE_CRYPT_H 1 +#define HAVE_DIRENT_H 1 +#define HAVE_DLFCN_H 1 +#define HAVE_EXECINFO_H 1 +#define HAVE_FCNTL_H 1 +#define HAVE_FENV_H 1 +#define HAVE_FLOAT_H 1 +/* #undef HAVE_FPU_CONTROL_H */ +#define HAVE_GRP_H 1 +/* #undef HAVE_IEEEFP_H */ +#define HAVE_LIMITS_H 1 +#define HAVE_MALLOC_H 1 +#define HAVE_MEMORY_H 1 +#define HAVE_NETINET_IN_H 1 +#define HAVE_PATHS_H 1 +#define HAVE_PWD_H 1 +#define HAVE_SCHED_H 1 +/* #undef HAVE_SELECT_H */ +#define HAVE_STDDEF_H 1 +#define HAVE_STDINT_H 1 +#define HAVE_STDLIB_H 1 +#define HAVE_STRING_H 1 +#define HAVE_STRINGS_H 1 +/* #undef HAVE_SYNCH_H */ +/* #undef HAVE_SYS_FPU_H */ +#define HAVE_SYS_IOCTL_H 1 +#define HAVE_SYS_IPC_H 1 +#define HAVE_SYS_MMAN_H 1 +#define HAVE_SYS_PRCTL_H 1 +#define HAVE_SYS_SELECT_H 1 +#define HAVE_SYS_SHM_H 1 +#define HAVE_SYS_SOCKET_H 1 +#define HAVE_SYS_STAT_H 1 +/* #undef HAVE_SYS_STREAM_H */ +#define HAVE_SYS_TIMEB_H 1 +#define HAVE_SYS_TYPES_H 1 +#define HAVE_SYS_UN_H 1 +/* #undef HAVE_SYSENT_H */ +#define HAVE_TERMIO_H 1 +#define HAVE_TERMIOS_H 1 +#define HAVE_UNISTD_H 1 +#define HAVE_UTIME_H 1 + +/* + * function definitions - processed in LibmysqlFunctions.txt + */ +#define HAVE_ACCESS 1 +/* #undef HAVE_AIOWAIT */ +#define HAVE_ALARM 1 +/* #undef HAVE_ALLOCA */ +#define HAVE_BCMP 1 +/* #undef HAVE_BFILL */ +/* #undef HAVE_BMOVE */ +#define HAVE_BZERO 1 +/* #undef HAVE_CLOCK_GETTIME */ +/* #undef HAVE_COMPRESS */ +/* #undef HAVE_CRYPT */ +#define HAVE_DLERROR 1 +#define HAVE_DLOPEN 1 +#define HAVE_FCHMOD 1 +#define HAVE_FCNTL 1 +/* #undef HAVE_FCONVERT */ +#define HAVE_FDATASYNC 1 +/* #undef HAVE_FESETROUND */ +#define HAVE_FINITE 1 +#define HAVE_FSEEKO 1 +#define HAVE_FSYNC 1 +#define HAVE_GETADDRINFO 1 +#define HAVE_GETCWD 1 +#define HAVE_GETHOSTBYADDR_R 1 +#define HAVE_GETHOSTBYNAME_R 1 +/* #undef HAVE_GETHRTIME */ +#define HAVE_GETNAMEINFO 1 +#define HAVE_GETPAGESIZE 1 +#define HAVE_GETPASS 1 +/* #undef HAVE_GETPASSPHRASE */ +#define HAVE_GETPWNAM 1 +#define HAVE_GETPWUID 1 +#define HAVE_GETRLIMIT 1 +#define HAVE_GETRUSAGE 1 +#define HAVE_GETWD 1 +#define HAVE_GMTIME_R 1 +#define HAVE_INITGROUPS 1 +#define HAVE_LDIV 1 +#define HAVE_LOCALTIME_R 1 +/* #undef HAVE_LOG2 */ +#define HAVE_LONGJMP 1 +#define HAVE_LSTAT 1 +#define HAVE_MADVISE 1 +#define HAVE_MALLINFO 1 +#define HAVE_MEMALIGN 1 +#define HAVE_MEMCPY 1 +#define HAVE_MEMMOVE 1 +#define HAVE_MKSTEMP 1 +#define HAVE_MLOCK 1 +#define HAVE_MLOCKALL 1 +#define HAVE_MMAP 1 +#define HAVE_MMAP64 1 +#define HAVE_PERROR 1 +#define HAVE_POLL 1 +#define HAVE_PREAD 1 +/* #undef HAVE_PTHREAD_ATTR_CREATE */ +/* #undef HAVE_PTHREAD_ATTR_GETSTACKSIZE */ +/* #undef HAVE_PTHREAD_ATTR_SETPRIO */ +#define HAVE_PTHREAD_ATTR_SETSCHEDPARAM 1 +#define HAVE_PTHREAD_ATTR_SETSCOPE 1 +/* #undef HAVE_PTHREAD_ATTR_SETSTACKSIZE */ +/* #undef HAVE_PTHREAD_CONDATTR_CREATE */ +/* #undef HAVE_PTHREAD_INIT */ +/* #undef HAVE_PTHREAD_KEY_DELETE */ +/* #undef HAVE_PTHREAD_KILL */ +/* #undef HAVE_PTHREAD_RWLOCK_RDLOCK */ +/* #undef HAVE_PTHREAD_SETPRIO_NP */ +#define HAVE_PTHREAD_SETSCHEDPARAM 1 +/* #undef HAVE_PTHREAD_SIGMASK */ +/* #undef HAVE_PTHREAD_THREADMASK */ +/* #undef HAVE_PTHREAD_YIELD_NP */ +#define HAVE_READDIR_R 1 +#define HAVE_READLINK 1 +#define HAVE_REALPATH 1 +#define HAVE_RENAME 1 +#define HAVE_SCHED_YIELD 1 +#define HAVE_SELECT 1 +/* #undef HAVE_SETFD */ +/* #undef HAVE_SETFILEPOINTER */ +#define HAVE_SIGNAL 1 +#define HAVE_SIGACTION 1 +/* #undef HAVE_SIGTHREADMASK */ +#define HAVE_SIGWAIT 1 +#define HAVE_SLEEP 1 +#define HAVE_SNPRINTF 1 +#define HAVE_STPCPY 1 +#define HAVE_STRERROR 1 +/* #undef HAVE_STRLCPY */ +#define HAVE_STRNLEN 1 +#define HAVE_STRPBRK 1 +#define HAVE_STRSEP 1 +#define HAVE_STRSTR 1 +#define HAVE_STRTOK_R 1 +#define HAVE_STRTOL 1 +#define HAVE_STRTOLL 1 +#define HAVE_STRTOUL 1 +#define HAVE_STRTOULL 1 +/* #undef HAVE_TELL */ +/* #undef HAVE_THR_SETCONCURRENCY */ +/* #undef HAVE_THR_YIELD */ +#define HAVE_VASPRINTF 1 +#define HAVE_VSNPRINTF 1 + +/* + * types and sizes + */ +/* Types we may use */ +#define SIZEOF_CHAR 1 +#if SIZEOF_CHAR +# define HAVE_CHAR 1 +#endif + +#define SIZEOF_CHARP 8 +#if SIZEOF_CHARP +# define HAVE_CHARP 1 +#endif + +#define SIZEOF_SHORT 2 +#if SIZEOF_SHORT +# define HAVE_SHORT 1 +#endif + +#define SIZEOF_INT 4 +#if SIZEOF_INT +# define HAVE_INT 1 +#endif + +#define SIZEOF_LONG 8 +#if SIZEOF_LONG +# define HAVE_LONG 1 +#endif + +#define SIZEOF_LONG_LONG 8 +#if SIZEOF_LONG_LONG +# define HAVE_LONG_LONG 1 +#endif + +#define SIZEOF_OFF_T 8 +#if SIZEOF_OFF_T +# define HAVE_OFF_T 1 +#endif + +#define SIZEOF_SIGSET_T 128 +#if SIZEOF_SIGSET_T +# define HAVE_SIGSET_T 1 +#endif + +#define SIZEOF_SIZE_T 8 +#if SIZEOF_SIZE_T +# define HAVE_SIZE_T 1 +#endif + +/* #undef SIZEOF_UCHAR */ +#if SIZEOF_UCHAR +# define HAVE_UCHAR 1 +#endif + +#define SIZEOF_UINT 4 +#if SIZEOF_UINT +# define HAVE_UINT 1 +#endif + +#define SIZEOF_ULONG 8 +#if SIZEOF_ULONG +# define HAVE_ULONG 1 +#endif + +/* #undef SIZEOF_INT8 */ +#if SIZEOF_INT8 +# define HAVE_INT8 1 +#endif +/* #undef SIZEOF_UINT8 */ +#if SIZEOF_UINT8 +# define HAVE_UINT8 1 +#endif + +/* #undef SIZEOF_INT16 */ +#if SIZEOF_INT16 +# define HAVE_INT16 1 +#endif +/* #undef SIZEOF_UINT16 */ +#if SIZEOF_UINT16 +# define HAVE_UINT16 1 +#endif + +/* #undef SIZEOF_INT32 */ +#if SIZEOF_INT32 +# define HAVE_INT32 1 +#endif +/* #undef SIZEOF_UINT32 */ +#if SIZEOF_UINT32 +# define HAVE_UINT32 1 +#endif +/* #undef SIZEOF_U_INT32_T */ +#if SIZEOF_U_INT32_T +# define HAVE_U_INT32_T 1 +#endif + +/* #undef SIZEOF_INT64 */ +#if SIZEOF_INT64 +# define HAVE_INT64 1 +#endif +/* #undef SIZEOF_UINT64 */ +#if SIZEOF_UINT64 +# define HAVE_UINT64 1 +#endif + +/* #undef SIZEOF_SOCKLEN_T */ +#if SIZEOF_SOCKLEN_T +# define HAVE_SOCKLEN_T 1 +#endif + +#define SOCKET_SIZE_TYPE socklen_t + +#define RETSIGTYPE void +#define RETQSORTTYPE void + +/* + * various other defines + */ +/* #undef HAVE_THREADS */ +#define SHAREDIR "share" +#define DEFAULT_CHARSET_HOME "/usr/local" diff --git a/libmariadb/mysql_version.h b/libmariadb/mysql_version.h new file mode 100644 index 000000000000..26120a9ec10a --- /dev/null +++ b/libmariadb/mysql_version.h @@ -0,0 +1,24 @@ +/* Copyright Abandoned 1996, 1999, 2001 MySQL AB + This file is public domain and comes with NO WARRANTY of any kind */ + +/* Version numbers for protocol & mysqld */ + +#ifdef _CUSTOMCONFIG_ +#include +#else +#define PROTOCOL_VERSION 10 +#define MYSQL_CLIENT_VERSION "5.3.2" +#define MYSQL_SERVER_VERSION "5.3.2" +#define MYSQL_SERVER_SUFFIX "" +#define FRM_VER +#define MYSQL_VERSION_ID 50302 +#define MYSQL_PORT 3306 +#define MYSQL_UNIX_ADDR "/tmp/mysql.sock" +#define MYSQL_CONFIG_NAME "my" + +/* mysqld compile time options */ +#ifndef MYSQL_CHARSET +#define MYSQL_CHARSET "" +#endif +#endif + diff --git a/libmariadb/prj/build.lst b/libmariadb/prj/build.lst new file mode 100644 index 000000000000..3725a39e229a --- /dev/null +++ b/libmariadb/prj/build.lst @@ -0,0 +1,2 @@ +lmdb libmariadb : soltools NULL +lmdb libmariadb\prj nmake - all lmdb_libmariadb NULL -- cgit