CVS commit: pkgsrc/net/powerdns

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Fri Mar 24 15:14:14 UTC 2017

Modified Files:
        pkgsrc/net/powerdns: distinfo
Added Files:
        pkgsrc/net/powerdns/patches: patch-ext_json11_json11.cpp

Log Message:
Fix build with clang: ISO C++ says nullptr has no relation operators
defined.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 pkgsrc/net/powerdns/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/net/powerdns/patches/patch-ext_json11_json11.cpp

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

Modified files:

Index: pkgsrc/net/powerdns/distinfo
diff -u pkgsrc/net/powerdns/distinfo:1.22 pkgsrc/net/powerdns/distinfo:1.23
--- pkgsrc/net/powerdns/distinfo:1.22   Thu Mar  9 13:32:54 2017
+++ pkgsrc/net/powerdns/distinfo        Fri Mar 24 15:14:14 2017
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.22 2017/03/09 13:32:54 fhajny Exp $
+$NetBSD: distinfo,v 1.23 2017/03/24 15:14:14 joerg Exp $
 
 SHA1 (pdns-4.0.3.tar.bz2) = de3562f135d31c6ccf9363f587bb59a5f65d1d91
 RMD160 (pdns-4.0.3.tar.bz2) = 5befc3a60dbbb14386f3557c7c419ee4b92b2438
 SHA512 (pdns-4.0.3.tar.bz2) = 58d33ac6cf457a916bae6abd8d2dc17f76fbcd1bd9e649948584dd669f5596b43e3e4d91841700ea1ea2cd1ac102749e503cd9075273540f33a2321e20d8bfc2
 Size (pdns-4.0.3.tar.bz2) = 1312299 bytes
 SHA1 (patch-configure) = 675ce8b372819a746ec9d4fbff6bea30ecd86734
+SHA1 (patch-ext_json11_json11.cpp) = a8ffe67156a836841aef8a6bba134a82283f381e
 SHA1 (patch-pdns_dns.hh) = 626eb4e29b7fcd82fbe056036c157c1e85fa49ca
 SHA1 (patch-pdns_dnsscope.cc) = b289b750686b25041c3e291fb0d3d562beb36eaf
 SHA1 (patch-pdns_iputils.hh) = 48df687a1e5116238aa4f04ff89cbdc2b4b4dfc3

Added files:

Index: pkgsrc/net/powerdns/patches/patch-ext_json11_json11.cpp
diff -u /dev/null pkgsrc/net/powerdns/patches/patch-ext_json11_json11.cpp:1.1
--- /dev/null   Fri Mar 24 15:14:14 2017
+++ pkgsrc/net/powerdns/patches/patch-ext_json11_json11.cpp     Fri Mar 24 15:14:14 2017
@@ -0,0 +1,30 @@
+$NetBSD: patch-ext_json11_json11.cpp,v 1.1 2017/03/24 15:14:14 joerg Exp $
+
+Clang rejects ordering relations for nullptr, so introduce a template
+indirection.
+
+--- ext/json11/json11.cpp.orig 2017-03-24 11:51:24.440658307 +0000
++++ ext/json11/json11.cpp
+@@ -132,6 +133,13 @@ void Json::dump(string &out) const {
+  * Value wrappers
+  */
+ 
++template <typename T> bool json11_less(T a, T b) {
++  return a < b;
++}
++template <> bool json11_less(const std::nullptr_t a, const std::nullptr_t b) {
++  return false;
++}
++
+ template <Json::Type tag, typename T>
+ class Value : public JsonValue {
+ protected:
+@@ -150,7 +158,7 @@ protected:
+         return m_value == static_cast<const Value<tag, T> *>(other)->m_value;
+     }
+     bool less(const JsonValue * other) const override {
+-        return m_value < static_cast<const Value<tag, T> *>(other)->m_value;
++        return json11_less(m_value, static_cast<const Value<tag, T> *>(other)->m_value);
+     }
+ 
+     const T m_value;