nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'public/bug15127_025' into maint-0.2.6

Browse Source
This commit is contained in:
Nick Mathewson 2015-03-04 12:14:17 +01:00
commit 5ad47aafab
3 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/bug15127 Normal file
View File

@ -0,0 +1,3 @@
o Minor bugfixes (compilation):
- Add missing dependencies to fix compilation on BSD. Patch from
Peter Palfrader. Fixes bug 15127; bugfix on 0.2.5.1-alpha.

1
src/common/include.am
View File

@ -146,4 +146,5 @@ src/common/common_sha1.i: $(libor_SOURCES) $(libor_crypto_a_SOURCES) $(COMMONHEA
fi fi
src/common/util_codedigest.o: src/common/common_sha1.i 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

1
src/or/include.am
View File

@ -190,6 +190,7 @@ ORHEADERS = \
noinst_HEADERS+= $(ORHEADERS) micro-revision.i noinst_HEADERS+= $(ORHEADERS) micro-revision.i
src/or/config_codedigest.o: src/or/or_sha1.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 micro-revision.i: FORCE
@rm -f micro-revision.tmp; \ @rm -f micro-revision.tmp; \