[tor-commits] [tor/maint-0.3.4] Remove duplicate MODULE_DIRAUTH_SOURCES from libtor_testing.a

[nickm@xxxxxxxxxxxxxx]

commit 70d91bd059869a0ecf24ceb66942ada4f66f03c9
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon Jun 18 17:03:52 2018 -0400

    Remove duplicate MODULE_DIRAUTH_SOURCES from libtor_testing.a
    
    This was already added to LIBTOR_A_SOURCES; it doesn't need to get
    added again.
    
    Fixes bug 26402. Bugfix on 0.3.4.1-alpha.
---
 changes/bug26402           | 4 ++++
 configure.ac               | 1 +
 src/or/include.am          | 2 +-
 src/rust/crypto/Cargo.toml | 2 +-
 src/test/include.am        | 4 ++--
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/changes/bug26402 b/changes/bug26402
new file mode 100644
index 000000000..b21283a2d
--- /dev/null
+++ b/changes/bug26402
@@ -0,0 +1,4 @@
+  o Minor bugfixes (compilation):
+    - When linking the libtor_testing.a library, only include the dirauth
+      object files once.  Previously, they were getting added twice.
+      Fixes bug 26402; bugfix on 0.3.4.1-alpha.
diff --git a/configure.ac b/configure.ac
index 48ca5bae1..fa889c152 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2274,6 +2274,7 @@ AC_CONFIG_FILES([
         src/config/torrc.sample
         src/config/torrc.minimal
         src/rust/.cargo/config
+        src/rust/build.rs
         scripts/maint/checkOptionDocs.pl
         scripts/maint/updateVersions.pl
 ])
diff --git a/src/or/include.am b/src/or/include.am
index 0e2aac4aa..33d76eebd 100644
--- a/src/or/include.am
+++ b/src/or/include.am
@@ -131,7 +131,7 @@ endif
 
 src_or_libtor_a_SOURCES = $(LIBTOR_A_SOURCES)
 if UNITTESTS_ENABLED
-src_or_libtor_testing_a_SOURCES = $(LIBTOR_A_SOURCES) $(MODULE_DIRAUTH_SOURCES)
+src_or_libtor_testing_a_SOURCES = $(LIBTOR_A_SOURCES)
 else
 src_or_libtor_testing_a_SOURCES =
 endif
diff --git a/src/rust/crypto/Cargo.toml b/src/rust/crypto/Cargo.toml
index c0c5e7bf9..9d302ee3b 100644
--- a/src/rust/crypto/Cargo.toml
+++ b/src/rust/crypto/Cargo.toml
@@ -4,6 +4,7 @@ authors = ["The Tor Project",
 name = "crypto"
 version = "0.0.1"
 publish = false
+build = "../build.rs"
 
 [lib]
 name = "crypto"
@@ -26,4 +27,3 @@ rand_core = { version = "=0.2.0-pre.0", default-features = false }
 
 [features]
 testing = ["tor_log/testing"]
-
diff --git a/src/test/include.am b/src/test/include.am
index 2ae598b22..8b61e3520 100644
--- a/src/test/include.am
+++ b/src/test/include.am
@@ -347,7 +347,7 @@ src_test_test_bt_cl_LDADD = src/common/libor-testing.a \
 	src/trace/libor-trace.a \
 	$(rust_ldadd) \
 	@TOR_LIB_MATH@ \
-	@TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ 
+	@TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@
 src_test_test_bt_cl_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS)
 src_test_test_bt_cl_CPPFLAGS= $(src_test_AM_CPPFLAGS) $(TEST_CPPFLAGS)
 
@@ -375,5 +375,5 @@ EXTRA_DIST += \
 	src/test/test_workqueue_pipe2.sh \
 	src/test/test_workqueue_socketpair.sh
 
-test-rust:
+test-rust: src/rust/build.rs
 	$(TESTS_ENVIRONMENT) "$(abs_top_srcdir)/src/test/test_rust.sh"



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits