diff options
author | joerg <joerg> | 2014-05-27 09:55:03 +0000 |
---|---|---|
committer | joerg <joerg> | 2014-05-27 09:55:03 +0000 |
commit | f5d402d23799f8b76265ca6d824a8f5195c6169b (patch) | |
tree | 24a31c5fbf17c4fb3cb72d62883e341dbcbc5574 /databases/sqlrelay | |
parent | b46cd7b7f1b2af95eac2ed253ffd911afbc6da16 (diff) | |
download | pkgsrc-f5d402d23799f8b76265ca6d824a8f5195c6169b.tar.gz |
Fix build with clang.
Diffstat (limited to 'databases/sqlrelay')
-rw-r--r-- | databases/sqlrelay/Makefile | 8 | ||||
-rw-r--r-- | databases/sqlrelay/distinfo | 4 | ||||
-rw-r--r-- | databases/sqlrelay/patches/patch-src_api_c++_src_sqlrcursor.cpp | 17 | ||||
-rw-r--r-- | databases/sqlrelay/patches/patch-src_loggers_custom__sc.cpp | 13 |
4 files changed, 40 insertions, 2 deletions
diff --git a/databases/sqlrelay/Makefile b/databases/sqlrelay/Makefile index ed62696175b..919bbb18d5b 100644 --- a/databases/sqlrelay/Makefile +++ b/databases/sqlrelay/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2014/05/22 12:50:47 fhajny Exp $ +# $NetBSD: Makefile,v 1.37 2014/05/27 09:55:03 joerg Exp $ COMMENT= Database connection pooling middleware and API @@ -53,6 +53,12 @@ RCD_SCRIPTS+= sqlrelay sqlrcachemanager RCD_SCRIPT_SRC.sqlrelay= ${WRKSRC}/init/rc.sqlrelay RCD_SCRIPT_SRC.sqlrcachemanager= ${WRKSRC}/init/rc.sqlrcachemanager +.include "../../mk/compiler.mk" + +.if !empty(PKGSRC_COMPILER:Mclang) +_WRAP_EXTRA_ARGS.CXX+= -Wno-error=unused-private-field -Wno-error=mismatched-tags +.endif + post-install: ${INSTALL_DATA} ${WRKSRC}/init/sqlrelay ${DESTDIR}${EGDIR}/sqlrelay diff --git a/databases/sqlrelay/distinfo b/databases/sqlrelay/distinfo index ec81fcd4c8c..e38a0c14488 100644 --- a/databases/sqlrelay/distinfo +++ b/databases/sqlrelay/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.8 2014/05/22 12:50:48 fhajny Exp $ +$NetBSD: distinfo,v 1.9 2014/05/27 09:55:03 joerg Exp $ SHA1 (sqlrelay-0.55.tar.gz) = ce47d8564e13d03b1eda8ff5d497fb056b5752e2 RMD160 (sqlrelay-0.55.tar.gz) = 9e727d2307f471ea935b5a8831a53929f0400c98 @@ -7,3 +7,5 @@ SHA1 (patch-ad) = c1c95f0938ed9efff7fd21392f7adeed80a86468 SHA1 (patch-configure) = 4aa35512ac7d5a97f0f511ba2432dc48a1b68159 SHA1 (patch-etc_Makefile) = 262968ad43d34d53b4fe65514c1351127660e12c SHA1 (patch-init_rc.sqlrelay.in) = 6d358d9396339ecee8ef3b7054750100433fb271 +SHA1 (patch-src_api_c++_src_sqlrcursor.cpp) = ed1faf27227bc85c006808e9928a42ed9f86cdf2 +SHA1 (patch-src_loggers_custom__sc.cpp) = 79e2b0a54b151e76175f549747e3392accd0b4d9 diff --git a/databases/sqlrelay/patches/patch-src_api_c++_src_sqlrcursor.cpp b/databases/sqlrelay/patches/patch-src_api_c++_src_sqlrcursor.cpp new file mode 100644 index 00000000000..6a020f6bd0a --- /dev/null +++ b/databases/sqlrelay/patches/patch-src_api_c++_src_sqlrcursor.cpp @@ -0,0 +1,17 @@ +$NetBSD: patch-src_api_c++_src_sqlrcursor.cpp,v 1.1 2014/05/27 09:55:04 joerg Exp $ + +--- src/api/c++/src/sqlrcursor.cpp.orig 2014-05-23 16:56:02.000000000 +0000 ++++ src/api/c++/src/sqlrcursor.cpp +@@ -4223,10 +4223,10 @@ void sqlrcursor::createFieldLengths() { + // fieldlengths[1] (corresponding to row 4) + uint64_t rowbuffercount=rowcount-firstrowindex; + fieldlengths=new uint32_t *[rowbuffercount+1]; +- fieldlengths[rowbuffercount]=(uint32_t)NULL; ++ fieldlengths[rowbuffercount]=(uint32_t *)NULL; + for (uint64_t i=0; i<rowbuffercount; i++) { + fieldlengths[i]=new uint32_t[colcount+1]; +- fieldlengths[i][colcount]=(uint32_t)NULL; ++ fieldlengths[i][colcount]=0; + for (uint32_t j=0; j<colcount; j++) { + fieldlengths[i][j]=getFieldLengthInternal(i,j); + } diff --git a/databases/sqlrelay/patches/patch-src_loggers_custom__sc.cpp b/databases/sqlrelay/patches/patch-src_loggers_custom__sc.cpp new file mode 100644 index 00000000000..ed60a08e065 --- /dev/null +++ b/databases/sqlrelay/patches/patch-src_loggers_custom__sc.cpp @@ -0,0 +1,13 @@ +$NetBSD: patch-src_loggers_custom__sc.cpp,v 1.1 2014/05/27 09:55:04 joerg Exp $ + +--- src/loggers/custom_sc.cpp.orig 2014-05-23 17:02:08.000000000 +0000 ++++ src/loggers/custom_sc.cpp +@@ -131,7 +131,7 @@ bool custom_sc::run(sqlrlistener *sqlrl, + + // get the client IP, it's needed for some events + const char *clientaddr="unknown"; +- if (sqlrcon && sqlrcon->cont->connstats->clientaddr) { ++ if (sqlrcon && sqlrcon->cont->connstats->clientaddr[0]) { + clientaddr=sqlrcon->cont->connstats->clientaddr; + } + |