BIND 10 trac2980, updated. bfcf73f7b86036c774b90e1df948e12399269385 [2980] Build test libraries dynamically even if static linking is requested

BIND 10 source code commits bind10-changes at lists.isc.org
Tue Jul 9 16:29:29 UTC 2013


The branch, trac2980 has been updated
       via  bfcf73f7b86036c774b90e1df948e12399269385 (commit)
      from  5b7b932c171d48009f722ea20ecdbe852ad2b8aa (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 bfcf73f7b86036c774b90e1df948e12399269385
Author: Stephen Morris <stephen at isc.org>
Date:   Tue Jul 9 17:28:23 2013 +0100

    [2980] Build test libraries dynamically even if static linking is requested
    
    The hooks system can only load shared libraries, even if BIND 10 is
    linked statically.

-----------------------------------------------------------------------

Summary of changes:
 src/lib/hooks/tests/Makefile.am |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/hooks/tests/Makefile.am b/src/lib/hooks/tests/Makefile.am
index 8fe94b0..cc01aab 100644
--- a/src/lib/hooks/tests/Makefile.am
+++ b/src/lib/hooks/tests/Makefile.am
@@ -2,11 +2,6 @@ SUBDIRS = .
 
 AM_CPPFLAGS  = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
 AM_CPPFLAGS += $(BOOST_INCLUDES) $(MULTITHREADING_FLAG)
-AM_LDFLAGS = $(PTHREAD_LDFLAGS)
-
-if USE_STATIC_LINK
-AM_LDFLAGS += -static
-endif
 
 # Some versions of GCC warn about some versions of Boost regarding
 # missing initializer for members in its posix_time.
@@ -88,6 +83,12 @@ nodist_run_unittests_SOURCES += test_libraries.h
 
 run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
 run_unittests_LDFLAGS  = $(AM_LDFLAGS)  $(GTEST_LDFLAGS)
+if USE_STATIC_LINK
+# If specified, only link unit tests static - the test libraries must be
+# build as shared libraries.
+run_unittests_LDFLAGS  += -static
+endif
+
 run_unittests_LDADD    = $(AM_LDADD)    $(GTEST_LDADD)
 
 run_unittests_LDADD += $(top_builddir)/src/lib/hooks/libb10-hooks.la



More information about the bind10-changes mailing list