BIND 10 trac2899, updated. eacf6593309211e0cdc1867d69d4eeae86bc450c [2899] explicitly LDADD libb10-threads from log lock test
BIND 10 source code commits
bind10-changes at lists.isc.org
Thu May 9 20:18:46 UTC 2013
The branch, trac2899 has been updated
via eacf6593309211e0cdc1867d69d4eeae86bc450c (commit)
from 6ed2d962ac93a626c7fe4494a0a060858c4125d0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit eacf6593309211e0cdc1867d69d4eeae86bc450c
Author: JINMEI Tatuya <jinmei at isc.org>
Date: Thu May 9 20:21:05 2013 +0000
[2899] explicitly LDADD libb10-threads from log lock test
seems to be necessary for some OS. also explicitly include the relevant
header file.
-----------------------------------------------------------------------
Summary of changes:
src/lib/log/tests/Makefile.am | 3 +++
src/lib/log/tests/logger_lock_test.cc | 2 ++
2 files changed, 5 insertions(+)
-----------------------------------------------------------------------
diff --git a/src/lib/log/tests/Makefile.am b/src/lib/log/tests/Makefile.am
index fbb2217..36582e6 100644
--- a/src/lib/log/tests/Makefile.am
+++ b/src/lib/log/tests/Makefile.am
@@ -46,6 +46,8 @@ buffer_logger_test_LDADD += $(top_builddir)/src/lib/util/libb10-util.la
buffer_logger_test_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
buffer_logger_test_LDADD += $(AM_LDADD) $(LOG4CPLUS_LIBS)
+# This test directly uses libb10-threads, and on some systems it seems to
+# require explicit LDADD (even if libb10-log has indirect dependencies)
noinst_PROGRAMS += logger_lock_test
logger_lock_test_SOURCES = logger_lock_test.cc
nodist_logger_lock_test_SOURCES = log_test_messages.cc log_test_messages.h
@@ -53,6 +55,7 @@ logger_lock_test_CPPFLAGS = $(AM_CPPFLAGS)
logger_lock_test_LDFLAGS = $(AM_LDFLAGS)
logger_lock_test_LDADD = $(top_builddir)/src/lib/log/libb10-log.la
logger_lock_test_LDADD += $(top_builddir)/src/lib/util/libb10-util.la
+logger_lock_test_LDADD += $(top_builddir)/src/lib/util/threads/libb10-threads.la
logger_lock_test_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
logger_lock_test_LDADD += $(AM_LDADD) $(LOG4CPLUS_LIBS)
diff --git a/src/lib/log/tests/logger_lock_test.cc b/src/lib/log/tests/logger_lock_test.cc
index 2e40015..605c207 100644
--- a/src/lib/log/tests/logger_lock_test.cc
+++ b/src/lib/log/tests/logger_lock_test.cc
@@ -18,6 +18,8 @@
#include <log/log_messages.h>
#include <log/interprocess/interprocess_sync.h>
#include "log_test_messages.h"
+
+#include <util/threads/sync.h>
#include <iostream>
using namespace std;
More information about the bind10-changes
mailing list