Opened 4 years ago

Closed 4 years ago

#15127 closed defect (wontfix)

testing missing dependency on *_sha1.i

Reported by: weasel Owned by:
Priority: Medium Milestone: Tor: 0.2.7.x-final
Component: Core Tor/Tor Version: Tor: unspecified
Severity: Keywords: 025-backport
Cc: Actual Points:
Parent ID: Points:
Reviewer: Sponsor:

Description

On Tor master,

--- src/common/src_common_libor_testing_a-util_codedigest.o ---
../tor/src/common/util_codedigest.c:10:10: fatal error: 'common_sha1.i' file not found
#include "common_sha1.i"         ^
  CC       src/or/src_or_libtor_testing_a-config_codedigest.o
../tor/src/or/config_codedigest.c:10:10: fatal error: 'or_sha1.i' file not found
#include "or_sha1.i"

At least these appear to be fixed by

diff --git a/src/common/include.am b/src/common/include.am
index 5b63392..a642f7a 100644
--- a/src/common/include.am
+++ b/src/common/include.am
@@ -146,4 +146,5 @@ src/common/common_sha1.i: $(libor_SOURCES) $(libor_crypto_a_SOURCES) $(COMMONHEA
 	fi
 
 src/common/util_codedigest.o: src/common/common_sha1.i
+src/common/src_common_libor_testing_a-util_codedigest.o: src/common/common_sha1.i
 
diff --git a/src/or/include.am b/src/or/include.am
index b44e109..e257ceb 100644
--- a/src/or/include.am
+++ b/src/or/include.am
@@ -190,6 +190,7 @@ ORHEADERS = \
 noinst_HEADERS+= $(ORHEADERS) micro-revision.i
 
 src/or/config_codedigest.o: src/or/or_sha1.i
+src/or/src_or_libtor_testing_a-config_codedigest.o: src/or/or_sha1.i
 
 micro-revision.i: FORCE
 	@rm -f micro-revision.tmp;				\
-- 
2.3.0

Child Tickets

Change History (7)

comment:1 Changed 4 years ago by weasel

Milestone: Tor: 0.2.5.x-final

comment:2 Changed 4 years ago by nickm

Keywords: 025-backport added
Milestone: Tor: 0.2.5.x-finalTor: 0.2.6.x-final
Status: newneeds_review

comment:3 Changed 4 years ago by nickm

Milestone: Tor: 0.2.6.x-finalTor: 0.2.5.x-final

This patch, plus a changes file, resides in bug15127_025 in my public repo. Merged it to 0.2.6 and forward; marking for possible 025 backport.

comment:4 Changed 4 years ago by nickm

Milestone: Tor: 0.2.5.x-finalTor: 0.2.6.x-final
Status: needs_reviewneeds_revision

The patch surprisingly broke build in a bunch of places. Weasel is investigating!

comment:5 Changed 4 years ago by nickm

(Reverting it for now)

comment:6 Changed 4 years ago by nickm

Milestone: Tor: 0.2.6.x-finalTor: 0.2.7.x-final

comment:7 Changed 4 years ago by nickm

Resolution: wontfix
Status: needs_revisionclosed

It would appear (see #14742) that the sha1.i files are on their way out.

Note: See TracTickets for help on using tickets.