diff options
| author | jperkin <jperkin@pkgsrc.org> | 2019-01-29 23:33:54 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2019-01-29 23:33:54 +0000 |
| commit | e69fa4ee173d2f8ba1b15f8e5456206829557476 (patch) | |
| tree | 6e2957bb614efcfe2343b1cc59d50c720958bc1f | |
| parent | 9f4a1dd8791108f25987fd4cc5f7f103cda315e8 (diff) | |
| download | pkgsrc-e69fa4ee173d2f8ba1b15f8e5456206829557476.tar.gz | |
tdb: Fix build on SunOS (unicode vs str assertion failures).
| -rw-r--r-- | databases/tdb/distinfo | 4 | ||||
| -rw-r--r-- | databases/tdb/patches/patch-buildtools_wafsamba_samba__conftests.py | 19 |
2 files changed, 21 insertions, 2 deletions
diff --git a/databases/tdb/distinfo b/databases/tdb/distinfo index d751f458c1c..8f4afa47692 100644 --- a/databases/tdb/distinfo +++ b/databases/tdb/distinfo @@ -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 --git a/databases/tdb/patches/patch-buildtools_wafsamba_samba__conftests.py b/databases/tdb/patches/patch-buildtools_wafsamba_samba__conftests.py new file mode 100644 index 00000000000..19bc7af5e77 --- /dev/null +++ b/databases/tdb/patches/patch-buildtools_wafsamba_samba__conftests.py @@ -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, |