d4e00eca55
Updates pdns-recursor to current stable 4.2.1. Also includes more complete fix for boost.m4 BOOST::THREAD detection, removing dependency on boost-thread. Signed-off-by: James Taylor <james@jtaylor.id.au>
24 lines
831 B
Diff
24 lines
831 B
Diff
--- a/m4/boost.m4
|
|
+++ b/m4/boost.m4
|
|
@@ -667,12 +667,15 @@
|
|
BOOST_DEFUN([Context],
|
|
[boost_context_save_LIBS=$LIBS
|
|
boost_context_save_LDFLAGS=$LDFLAGS
|
|
-if test $boost_major_version -ge 157; then
|
|
- BOOST_THREAD([$1], [$2])
|
|
- m4_pattern_allow([^BOOST_THREAD_(LIBS|LDFLAGS)$])dnl
|
|
- LIBS="$LIBS $BOOST_THREAD_LIBS"
|
|
- LDFLAGS="$LDFLAGS $BOOST_THREAD_LDFLAGS"
|
|
-fi
|
|
+# This check is flawed and doesn't actually verify if BOOST::THREAD
|
|
+# is required on the system, producing only false positives on the
|
|
+# platforms supported by OpenWRT.
|
|
+#if test $boost_major_version -ge 157; then
|
|
+# BOOST_THREAD([$1], [$2])
|
|
+# m4_pattern_allow([^BOOST_THREAD_(LIBS|LDFLAGS)$])dnl
|
|
+# LIBS="$LIBS $BOOST_THREAD_LIBS"
|
|
+# LDFLAGS="$LDFLAGS $BOOST_THREAD_LDFLAGS"
|
|
+#fi
|
|
|
|
if test $boost_major_version -ge 161; then
|
|
BOOST_FIND_LIB([context], [$1],
|