aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--games/wesnoth/files/patch-m4-boost.m411
-rw-r--r--games/wesnoth/files/patch-src-tests-main.cpp10
2 files changed, 21 insertions, 0 deletions
diff --git a/games/wesnoth/files/patch-m4-boost.m4 b/games/wesnoth/files/patch-m4-boost.m4
new file mode 100644
index 000000000000..b6bce986a082
--- /dev/null
+++ b/games/wesnoth/files/patch-m4-boost.m4
@@ -0,0 +1,11 @@
+--- m4/boost.m4~ 2010-05-27 11:37:13.000000000 +0400
++++ m4/boost.m4 2010-08-23 07:12:17.014432212 +0400
+@@ -729,7 +729,7 @@ AC_CACHE_CHECK([for the flags needed to
+ esac
+ # Generate the test file.
+ AC_LANG_CONFTEST([AC_LANG_PROGRAM([#include <pthread.h>],
+- [pthread_t th; pthread_join(th, 0);
++ [pthread_t th=NULL; pthread_join(th, 0);
+ pthread_attr_init(0); pthread_cleanup_push(0, 0);
+ pthread_create(0,0,0,0); pthread_cleanup_pop(0);])])
+ for boost_pthread_flag in '' $boost_pthread_flags; do
diff --git a/games/wesnoth/files/patch-src-tests-main.cpp b/games/wesnoth/files/patch-src-tests-main.cpp
new file mode 100644
index 000000000000..0499eb4a81ca
--- /dev/null
+++ b/games/wesnoth/files/patch-src-tests-main.cpp
@@ -0,0 +1,10 @@
+--- src/tests/main.cpp~
++++ src/tests/main.cpp
+@@ -15,6 +15,7 @@
+ #define GETTEXT_DOMAIN "wesnoth-test"
+
+
++#define BOOST_TEST_DYN_LINK
+ #define BOOST_TEST_MODULE wesnoth unit tests master suite
+ #include <boost/test/unit_test.hpp>
+ #include <boost/test/unit_test_monitor.hpp>