diff options
| author | Marc Alff <marc.alff@oracle.com> | 2010-03-09 11:03:02 -0700 |
|---|---|---|
| committer | Marc Alff <marc.alff@oracle.com> | 2010-03-09 11:03:02 -0700 |
| commit | f6660539c24eabf7f784d1bdfedf8d01023c73c8 (patch) | |
| tree | a132647272f2039e25b26df61dafedb30ce539cd /libmysql_r | |
| parent | 58559ac827663a2b27bde116dc07610412330f06 (diff) | |
| download | mariadb-git-f6660539c24eabf7f784d1bdfedf8d01023c73c8.tar.gz | |
Bug#51878 Build break in HPUX involving mysql_prlock on a client
This is a fix specific for HPUX,
for which the compiler does not resolve properly dependencies
involving unused inline functions.
(See existing comments in mysql_thread.h)
In include/mysql/psi/mysql_thread.h,
the instrumentation helpers for mysql_prlock_*
uses the pr lock apis.
These apis are implemented in mysys/thr_rwlock.c,
which is not linked to client code.
As a result, the code does not link in libmysql_r, on HPUX.
The fix is to cut dependencies explicitely,
by introducing -DDISABLE_MYSQL_RWLOCK_H,
when building client code.
Diffstat (limited to 'libmysql_r')
| -rw-r--r-- | libmysql_r/Makefile.am | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libmysql_r/Makefile.am b/libmysql_r/Makefile.am index 4a37dcfdec9..94b66f29419 100644 --- a/libmysql_r/Makefile.am +++ b/libmysql_r/Makefile.am @@ -20,9 +20,11 @@ # # This file is public domain and comes with NO WARRANTY of any kind -target = libmysqlclient_r.la -target_defs = -DDONT_USE_RAID -DMYSQL_CLIENT @LIB_EXTRA_CCFLAGS@ -LIBS = @LIBS@ @ZLIB_LIBS@ @openssl_libs@ +target = libmysqlclient_r.la +target_defs = -DDISABLE_MYSQL_PRLOCK_H -DDONT_USE_RAID \ + -DMYSQL_CLIENT @LIB_EXTRA_CCFLAGS@ + +LIBS = @LIBS@ @ZLIB_LIBS@ @openssl_libs@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \ $(openssl_includes) @ZLIB_INCLUDES@ |