Attachment #183824 for bug #220289

Lines 2-9 Link Here

(-)Makefile (-2 / +1 lines)
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 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1484621032	1	TIMESTAMP = 1497513533
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




--- configure.orig	2017-06-13 11:59:12.000000000 +0200
+++ configure	2017-06-15 09:41:01.000000000 +0200
@@ -15885,17 +15885,14 @@
 
   case "$host" in
   mips* | powerpc* )
-    as_CACHEVAR=`$as_echo "ax_cv_check_ldflags_cannot continue" "$LINENO" 5
-    _-latomic" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts -latomic" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts -latomic" >&5
 $as_echo_n "checking whether the linker accepts -latomic... " >&6; }
-if eval \${$as_CACHEVAR+:} false; then :
+if ${ax_cv_check_ldflags___latomic+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
   ax_check_save_flags=$LDFLAGS
-  LDFLAGS="$LDFLAGS cannot continue" "$LINENO" 5
-     -latomic"
+  LDFLAGS="$LDFLAGS  -latomic"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -15908,21 +15905,21 @@
 }
 _ACEOF
 if ac_fn_cxx_try_link "$LINENO"; then :
-  eval "$as_CACHEVAR=yes"
+  ax_cv_check_ldflags___latomic=yes
 else
-  eval "$as_CACHEVAR=no"
+  ax_cv_check_ldflags___latomic=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
   LDFLAGS=$ax_check_save_flags
 fi
-eval ac_res=\$$as_CACHEVAR
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_ldflags___latomic" >&5
+$as_echo "$ax_cv_check_ldflags___latomic" >&6; }
+if test "x$ax_cv_check_ldflags___latomic" = xyes; then :
    :
 else
-  as_fn_error $? "Unable to link against libatomic
+   as_fn_error $? "Unable to link against libatomic, cannot continue" "$LINENO" 5
+
 fi
 
     LDFLAGS="-latomic $LDFLAGS"




--- ext/json11/json11.cpp.orig	2017-01-18 18:06:37 UTC
+++ ext/json11/json11.cpp
@@ -37,11 +37,21 @@ using std::make_shared;
 using std::initializer_list;
 using std::move;
 
+/* Helper for representing null - just a do-nothing struct, plus comparison
+ * operators so the helpers in JsonValue work. We can't use nullptr_t because
+ * it may not be orderable.
+*/
+
+struct NullStruct {
+    bool operator==(NullStruct) const { return true; }
+    bool operator<(NullStruct) const { return false; }
+};
+
 /* * * * * * * * * * * * * * * * * * * *
  * Serialization
  */
 
-static void dump(std::nullptr_t, string &out) {
+static void dump(NullStruct, string &out) {
     out += "null";
 }
 
@@ -204,9 +214,9 @@ public:
     explicit JsonObject(Json::object &&value)      : Value(move(value)) {}
 };
 
-class JsonNull final : public Value<Json::NUL, std::nullptr_t> {
+class JsonNull final : public Value<Json::NUL, NullStruct> {
 public:
-    JsonNull() : Value(nullptr) {}
+    JsonNull() : Value({}) {}
 };
 
 /* * * * * * * * * * * * * * * * * * * *

Return to bug 220289

Line 0 Link Here

(-)files/patch-configure (+52 lines)
	1	--- configure.orig 2017-06-13 11:59:12.000000000 +0200
	2	+++ configure 2017-06-15 09:41:01.000000000 +0200
	3	@@ -15885,17 +15885,14 @@
	4
	5	case "$host" in
	6	mips* \| powerpc* )
	7	- as_CACHEVAR=`$as_echo "ax_cv_check_ldflags_cannot continue" "$LINENO" 5
	8	- _-latomic" \| $as_tr_sh`
	9	-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts -latomic" >&5
	10	+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts -latomic" >&5
	11	$as_echo_n "checking whether the linker accepts -latomic... " >&6; }
	12	-if eval \${$as_CACHEVAR+:} false; then :
	13	+if ${ax_cv_check_ldflags___latomic+:} false; then :
	14	$as_echo_n "(cached) " >&6
	15	else
	16
	17	ax_check_save_flags=$LDFLAGS
	18	- LDFLAGS="$LDFLAGS cannot continue" "$LINENO" 5
	19	- -latomic"
	20	+ LDFLAGS="$LDFLAGS -latomic"
	21	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
	22	/* end confdefs.h. */
	23
	24	@@ -15908,21 +15905,21 @@
	25	}
	26	_ACEOF
	27	if ac_fn_cxx_try_link "$LINENO"; then :
	28	- eval "$as_CACHEVAR=yes"
	29	+ ax_cv_check_ldflags___latomic=yes
	30	else
	31	- eval "$as_CACHEVAR=no"
	32	+ ax_cv_check_ldflags___latomic=no
	33	fi
	34	rm -f core conftest.err conftest.$ac_objext \
	35	conftest$ac_exeext conftest.$ac_ext
	36	LDFLAGS=$ax_check_save_flags
	37	fi
	38	-eval ac_res=\$$as_CACHEVAR
	39	- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
	40	-$as_echo "$ac_res" >&6; }
	41	-if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then :
	42	+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_ldflags___latomic" >&5
	43	+$as_echo "$ax_cv_check_ldflags___latomic" >&6; }
	44	+if test "x$ax_cv_check_ldflags___latomic" = xyes; then :
	45	:
	46	else
	47	- as_fn_error $? "Unable to link against libatomic
	48	+ as_fn_error $? "Unable to link against libatomic, cannot continue" "$LINENO" 5
	49	+
	50	fi
	51
	52	LDFLAGS="-latomic $LDFLAGS"

Lines 1-37 Link Here

(-)files/patch-ext_json11_json11.cpp (-37 lines)
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	/* * * * * * * * * * * * * * * * * * * *