diff options
| author | tnn <tnn@pkgsrc.org> | 2022-03-27 13:33:21 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2022-03-27 13:33:21 +0000 |
| commit | d8ec9c0d4d8834966f544ab828137d9a9d48b20f (patch) | |
| tree | 64b24ff92585270c1d6ecebbd8e5b0057910968f /geography/geos | |
| parent | c28726eca0d1f641a984188e6957feeac4cd0663 (diff) | |
| download | pkgsrc-d8ec9c0d4d8834966f544ab828137d9a9d48b20f.tar.gz | |
geos: fix build on SunOS
Diffstat (limited to 'geography/geos')
| -rw-r--r-- | geography/geos/distinfo | 3 | ||||
| -rw-r--r-- | geography/geos/patches/patch-util_geosop_cxxopts.hpp | 22 |
2 files changed, 24 insertions, 1 deletions
diff --git a/geography/geos/distinfo b/geography/geos/distinfo index 76e029542db..4e957629bad 100644 --- a/geography/geos/distinfo +++ b/geography/geos/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.41 2022/03/13 14:28:59 gdt Exp $ +$NetBSD: distinfo,v 1.42 2022/03/27 13:33:21 tnn Exp $ BLAKE2s (geos-3.10.2.tar.bz2) = 461eca761abced3fcd140e7e0d8ca5a779ef438087d2560065c2350be2282648 SHA512 (geos-3.10.2.tar.bz2) = 390381711ccf56b862c2736cf6329200822f121de1c49df52b8b85cabea8c7787b199df2196acacc2e5c677ff3ebe042d93d70e89deadbc19d754499edb65126 Size (geos-3.10.2.tar.bz2) = 6714655 bytes SHA1 (patch-ae) = 253ae5cf5c2705a80d89d996507e3e94f2a11296 +SHA1 (patch-util_geosop_cxxopts.hpp) = 6da706852b026df7275be0a3caddadd1315f6e81 diff --git a/geography/geos/patches/patch-util_geosop_cxxopts.hpp b/geography/geos/patches/patch-util_geosop_cxxopts.hpp new file mode 100644 index 00000000000..f006623407a --- /dev/null +++ b/geography/geos/patches/patch-util_geosop_cxxopts.hpp @@ -0,0 +1,22 @@ +$NetBSD: patch-util_geosop_cxxopts.hpp,v 1.1 2022/03/27 13:33:21 tnn Exp $ + +On at least modern SunOS, int8_t is typedef'd to char, so parse_value() +that operates on int8_t& conflicts with the one that operates on char&. + +--- util/geosop/cxxopts.hpp.orig 2022-01-15 21:14:55.000000000 +0000 ++++ util/geosop/cxxopts.hpp +@@ -677,12 +677,14 @@ namespace cxxopts + integer_parser(text, value); + } + ++#if !defined(__sun) + inline + void + parse_value(const std::string& text, int8_t& value) + { + integer_parser(text, value); + } ++#endif + + inline + void |