View | Details | Raw Unified | Return to bug 220289 | Differences between
and this patch

Collapse All | Expand All

(-)dns/powerdns-recursor/Makefile (-3 / +2 lines)
Lines 2-9 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	recursor
4
PORTNAME=	recursor
5
PORTVERSION=	4.0.4
5
PORTVERSION=	4.0.5
6
PORTREVISION=	3
7
CATEGORIES=	dns ipv6
6
CATEGORIES=	dns ipv6
8
MASTER_SITES=	http://downloads.powerdns.com/releases/
7
MASTER_SITES=	http://downloads.powerdns.com/releases/
9
PKGNAMEPREFIX=	powerdns-
8
PKGNAMEPREFIX=	powerdns-
Lines 21-27 BROKEN_armv6= fails to compile: use of Link Here
21
BROKEN_sparc64=		fails to compile: json11.cpp: undefined reference to std::__throw_out_of_range_fmt
20
BROKEN_sparc64=		fails to compile: json11.cpp: undefined reference to std::__throw_out_of_range_fmt
22
BROKEN_powerpc64=	fails to compile: dnslabeltext.cc: undefined reference to std::__cxx11::basic_string
21
BROKEN_powerpc64=	fails to compile: dnslabeltext.cc: undefined reference to std::__cxx11::basic_string
23
22
24
USES=		compiler:c++11-lib cpe gmake localbase pkgconfig ssl tar:bzip2
23
USES=		autoreconf compiler:c++11-lib cpe gmake libtool localbase pkgconfig ssl tar:bzip2
25
GNU_CONFIGURE=	YES
24
GNU_CONFIGURE=	YES
26
CXXFLAGS+=	-D_GLIBCXX_USE_C99
25
CXXFLAGS+=	-D_GLIBCXX_USE_C99
27
26
(-)dns/powerdns-recursor/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1484621032
1
TIMESTAMP = 1498467562
2
SHA256 (pdns-recursor-4.0.4.tar.bz2) = 2338778f49ccd03401e65f6f4b39047890e691c8ff6d810ecee45321fb4f1e4d
2
SHA256 (pdns-recursor-4.0.5.tar.bz2) = ba43ce4280b3a06afebe58c5d63680f51dd525c63d1de7f3b229b380e6b1b7af
3
SIZE (pdns-recursor-4.0.4.tar.bz2) = 1050596
3
SIZE (pdns-recursor-4.0.5.tar.bz2) = 1066145
(-)dns/powerdns-recursor/files/patch-broken-configure-gh-issue-5401 (+11 lines)
Line 0 Link Here
1
--- m4/pdns_check_os.m4.orig	2017-06-13 11:58:51.000000000 +0200
2
+++ m4/pdns_check_os.m4	2017-06-26 14:31:43.581292095 +0200
3
@@ -39,7 +39,7 @@ AC_DEFUN([PDNS_CHECK_OS],[
4
   mips* | powerpc* )
5
     AX_CHECK_LINK_FLAG([-latomic],
6
       [ : ],
7
-      AC_MSG_ERROR([Unable to link against libatomic, cannot continue])
8
+      [ AC_MSG_ERROR([Unable to link against libatomic, cannot continue]) ]
9
     )
10
     LDFLAGS="-latomic $LDFLAGS"
11
     ;;
(-)dns/powerdns-recursor/files/patch-ext_json11_json11.cpp (-37 lines)
Lines 1-37 Link Here
1
--- ext/json11/json11.cpp.orig	2017-01-18 18:06:37 UTC
2
+++ ext/json11/json11.cpp
3
@@ -37,11 +37,21 @@ using std::make_shared;
4
 using std::initializer_list;
5
 using std::move;
6
 
7
+/* Helper for representing null - just a do-nothing struct, plus comparison
8
+ * operators so the helpers in JsonValue work. We can't use nullptr_t because
9
+ * it may not be orderable.
10
+*/
11
+
12
+struct NullStruct {
13
+    bool operator==(NullStruct) const { return true; }
14
+    bool operator<(NullStruct) const { return false; }
15
+};
16
+
17
 /* * * * * * * * * * * * * * * * * * * *
18
  * Serialization
19
  */
20
 
21
-static void dump(std::nullptr_t, string &out) {
22
+static void dump(NullStruct, string &out) {
23
     out += "null";
24
 }
25
 
26
@@ -204,9 +214,9 @@ public:
27
     explicit JsonObject(Json::object &&value)      : Value(move(value)) {}
28
 };
29
 
30
-class JsonNull final : public Value<Json::NUL, std::nullptr_t> {
31
+class JsonNull final : public Value<Json::NUL, NullStruct> {
32
 public:
33
-    JsonNull() : Value(nullptr) {}
34
+    JsonNull() : Value({}) {}
35
 };
36
 
37
 /* * * * * * * * * * * * * * * * * * * *

Return to bug 220289