CVS commit: pkgsrc/databases/qore-odbc-module

["Niclas Rosenvik" <nros%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nros
Date:           Fri Sep 22 09:18:22 UTC 2023

Modified Files:
        pkgsrc/databases/qore-odbc-module: distinfo
Added Files:
        pkgsrc/databases/qore-odbc-module/patches: patch-src_ODBCStatement.h

Log Message:
qore-odbc-module: fix build on Illumos


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/databases/qore-odbc-module/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/databases/qore-odbc-module/patches/patch-src_ODBCStatement.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/qore-odbc-module/distinfo
diff -u pkgsrc/databases/qore-odbc-module/distinfo:1.1 pkgsrc/databases/qore-odbc-module/distinfo:1.2
--- pkgsrc/databases/qore-odbc-module/distinfo:1.1      Wed Aug 16 09:03:51 2023
+++ pkgsrc/databases/qore-odbc-module/distinfo  Fri Sep 22 09:18:21 2023
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1 2023/08/16 09:03:51 nros Exp $
+$NetBSD: distinfo,v 1.2 2023/09/22 09:18:21 nros Exp $
 
 BLAKE2s (qore-odbc-module-1.2.0.tar.bz2) = edb1c85f6d22b7482623e5666b14137d9371bab7b581de1b4f5be756f0e68ead
 SHA512 (qore-odbc-module-1.2.0.tar.bz2) = 502e4f39c31e7e2c0f3472301f41baa196238c9797cd1b1774b9ec4fa8f12b18d22d573473de35b06cee7db35f85765b9d42577ba581e608a7981e2e84aa5d2d
 Size (qore-odbc-module-1.2.0.tar.bz2) = 45368 bytes
+SHA1 (patch-src_ODBCStatement.h) = 47b80c8d95563ff62b7f68b10a37bffeac3ddd55

Added files:

Index: pkgsrc/databases/qore-odbc-module/patches/patch-src_ODBCStatement.h
diff -u /dev/null pkgsrc/databases/qore-odbc-module/patches/patch-src_ODBCStatement.h:1.1
--- /dev/null   Fri Sep 22 09:18:22 2023
+++ pkgsrc/databases/qore-odbc-module/patches/patch-src_ODBCStatement.h Fri Sep 22 09:18:21 2023
@@ -0,0 +1,52 @@
+$NetBSD: patch-src_ODBCStatement.h,v 1.1 2023/09/22 09:18:21 nros Exp $
+
+* use std::pow, fixes:
+  "error: call to overloaded function is ambigous" on Illumos
+
+--- src/ODBCStatement.h.orig   2023-09-22 11:14:02.210099653 +0000
++++ src/ODBCStatement.h
+@@ -1149,7 +1149,7 @@ TIMESTAMP_STRUCT ODBCStatement::getTimes
+     if (options.frPrec >= 6) { // 6-9
+         t.fraction = info.us * 1000;
+     } else { // 1-5
+-        int n = pow(10, 6-options.frPrec);
++        int n = std::pow(10, 6-options.frPrec);
+         t.fraction = info.us / n;
+         t.fraction *= n * 1000;
+     }
+@@ -1238,7 +1238,7 @@ SQL_INTERVAL_STRUCT ODBCStatement::getSe
+         i.intval.day_second.fraction = abs(arg->getMicrosecond()) * 1000;
+     }
+     else { // 1-5
+-        int n = pow(10, 6-options.frPrec);
++        int n = std::pow(10, 6-options.frPrec);
+         i.intval.day_second.fraction = abs(arg->getMicrosecond()) / n;
+         i.intval.day_second.fraction *= n * 1000;
+     }
+@@ -1280,7 +1280,7 @@ SQL_INTERVAL_STRUCT ODBCStatement::getDa
+         i.intval.day_second.fraction = abs(arg->getMicrosecond()) * 1000;
+     }
+     else { // 1-5
+-        int n = pow(10, 6-options.frPrec);
++        int n = std::pow(10, 6-options.frPrec);
+         i.intval.day_second.fraction = abs(arg->getMicrosecond()) / n;
+         i.intval.day_second.fraction *= n * 1000;
+     }
+@@ -1310,7 +1310,7 @@ SQL_INTERVAL_STRUCT ODBCStatement::getHo
+         i.intval.day_second.fraction = abs(arg->getMicrosecond()) * 1000;
+     }
+     else { // 1-5
+-        int n = pow(10, 6-options.frPrec);
++        int n = std::pow(10, 6-options.frPrec);
+         i.intval.day_second.fraction = abs(arg->getMicrosecond()) / n;
+         i.intval.day_second.fraction *= n * 1000;
+     }
+@@ -1329,7 +1329,7 @@ SQL_INTERVAL_STRUCT ODBCStatement::getMi
+         i.intval.day_second.fraction = abs(arg->getMicrosecond()) * 1000;
+     }
+     else { // 1-5
+-        int n = pow(10, 6-options.frPrec);
++        int n = std::pow(10, 6-options.frPrec);
+         i.intval.day_second.fraction = abs(arg->getMicrosecond()) / n;
+         i.intval.day_second.fraction *= n * 1000;
+     }