diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-01-05 18:56:31 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-01-05 18:56:31 +0100 |
| commit | 506984181bd2bc0bdacb4d1154522c6be859b200 (patch) | |
| tree | 1ce6b17f9fc187535355d7a03c939a9a961cbef8 | |
| parent | d26173439113812d125a5763c394faef323b805b (diff) | |
| download | mariadb-git-506984181bd2bc0bdacb4d1154522c6be859b200.tar.gz | |
fixes for opensolaris compilation failures
| -rwxr-xr-x | BUILD/compile-solaris-amd64 | 2 | ||||
| -rw-r--r-- | dbug/dbug.c | 10 | ||||
| -rw-r--r-- | mysql-test/suite/federated/federated_debug-master.opt | 2 | ||||
| -rw-r--r-- | mysys/CMakeLists.txt | 2 |
4 files changed, 13 insertions, 3 deletions
diff --git a/BUILD/compile-solaris-amd64 b/BUILD/compile-solaris-amd64 index 92eff101d4c..dbb7a5c2a7c 100755 --- a/BUILD/compile-solaris-amd64 +++ b/BUILD/compile-solaris-amd64 @@ -26,7 +26,7 @@ path=`dirname $0` extra_flags="$amd64_cflags -D__sun -m64 -mtune=athlon64" extra_configs="$amd64_configs $max_configs --with-libevent" -LDFLAGS="-lmtmalloc -R/usr/sfw/lib/64" +LDFLAGS="-m64 -lmtmalloc -R/usr/sfw/lib/64" export LDFLAGS . "$path/FINISH.sh" diff --git a/dbug/dbug.c b/dbug/dbug.c index 645aeb100fd..8b3927d2427 100644 --- a/dbug/dbug.c +++ b/dbug/dbug.c @@ -2147,4 +2147,14 @@ const char* _db_get_func_(void) return cs->func; } +#else + +/* + * Dummy function, workaround for build failure on a platform where linking + * with an empty archive fails. + */ +int i_am_a_dummy_function() { + return 0; +} + #endif /* DBUG_OFF */ diff --git a/mysql-test/suite/federated/federated_debug-master.opt b/mysql-test/suite/federated/federated_debug-master.opt index ad9ba4795af..8d34f841f79 100644 --- a/mysql-test/suite/federated/federated_debug-master.opt +++ b/mysql-test/suite/federated/federated_debug-master.opt @@ -1 +1 @@ ---loose-debug=d,simulate_detached_thread_refresh +--loose-debug-dbug=d,simulate_detached_thread_refresh diff --git a/mysys/CMakeLists.txt b/mysys/CMakeLists.txt index 3b42e20c78c..9e47c7c5f19 100644 --- a/mysys/CMakeLists.txt +++ b/mysys/CMakeLists.txt @@ -66,7 +66,7 @@ ENDIF() ADD_CONVENIENCE_LIBRARY(mysys ${MYSYS_SOURCES}) TARGET_LINK_LIBRARIES(mysys dbug strings ${ZLIB_LIBRARY} - ${LIBNSL} ${LIBM} ${LIBRT}) + ${LIBNSL} ${LIBM} ${LIBRT} ${LIBSOCKET}) DTRACE_INSTRUMENT(mysys) IF(HAVE_BFD_H) |