[pkgsrc/trunk]: pkgsrc/databases/tdb tdb: Fix build on SunOS (unicode vs str ...

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2ca7785cb04f
branches:  trunk
changeset: 318801:2ca7785cb04f
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Tue Jan 29 23:33:54 2019 +0000

description:
tdb: Fix build on SunOS (unicode vs str assertion failures).

diffstat:

 databases/tdb/distinfo                                              |   4 +-
 databases/tdb/patches/patch-buildtools_wafsamba_samba__conftests.py |  19 ++++++++++
 2 files changed, 21 insertions(+), 2 deletions(-)

diffs (36 lines):

diff -r ad9a4a8cc5e5 -r 2ca7785cb04f databases/tdb/distinfo
--- a/databases/tdb/distinfo    Tue Jan 29 22:41:00 2019 +0000
+++ b/databases/tdb/distinfo    Tue Jan 29 23:33:54 2019 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.15 2019/01/17 21:29:39 adam Exp $
+$NetBSD: distinfo,v 1.16 2019/01/29 23:33:54 jperkin Exp $
 
 SHA1 (tdb-1.3.17.tar.gz) = 4cff48170f2ad3bfc85364f6f245d0b785260dba
 RMD160 (tdb-1.3.17.tar.gz) = e1a39c84812e5f95bfdce8ae8cdf90c81f383c88
 SHA512 (tdb-1.3.17.tar.gz) = ef25dad520a12d75e541802a46e418fe61ac691126600f24158cd5b95091b4c536ffc4d4aff6608cca087291fde0b86b44ff7b1a7837d816cd534e9688c39eff
 Size (tdb-1.3.17.tar.gz) = 697224 bytes
-SHA1 (patch-buildtools_wafsamba_samba__install.py) = d801340617da325e3bb70a90350e45cc8e383c2d
+SHA1 (patch-buildtools_wafsamba_samba__conftests.py) = 69cb193ba4e1f5ba9a478c21aee166dc499d37f1
diff -r ad9a4a8cc5e5 -r 2ca7785cb04f databases/tdb/patches/patch-buildtools_wafsamba_samba__conftests.py
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/tdb/patches/patch-buildtools_wafsamba_samba__conftests.py       Tue Jan 29 23:33:54 2019 +0000
@@ -0,0 +1,19 @@
+$NetBSD: patch-buildtools_wafsamba_samba__conftests.py,v 1.1 2019/01/29 23:33:54 jperkin Exp $
+
+Ensure defines are strings to avoid assertion failure, some
+returned values are unicode.
+
+--- buildtools/wafsamba/samba_conftests.py.orig        2019-01-29 23:12:58.026242040 +0000
++++ buildtools/wafsamba/samba_conftests.py
+@@ -97,9 +97,9 @@ def CHECK_LARGEFILE(conf, define='HAVE_L
+                 if flag[:2] == "-D":
+                     flag_split = flag[2:].split('=')
+                     if len(flag_split) == 1:
+-                        conf.DEFINE(flag_split[0], '1')
++                        conf.DEFINE(str(flag_split[0]), '1')
+                     else:
+-                        conf.DEFINE(flag_split[0], flag_split[1])
++                        conf.DEFINE(str(flag_split[0]), str(flag_split[1]))
+ 
+     if conf.CHECK_CODE('return !(sizeof(off_t) >= 8)',
+                        define,