pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/net/tor net/tor: Add missing dependency to makefile



details:   https://anonhg.NetBSD.org/pkgsrc/rev/0fcd6e3c2b60
branches:  trunk
changeset: 331771:0fcd6e3c2b60
user:      gdt <gdt%pkgsrc.org@localhost>
date:      Mon Mar 25 00:36:06 2019 +0000

description:
net/tor: Add missing dependency to makefile

The upstream Makefile.in fails to express a dependency.  However,
instead of the usual situation where a -j1 build works and a parallel
build sometimes fails, the -j1 build reliably fails and a -j4 or -j10
occasionally works.

diffstat:

 net/tor/Makefile                  |   4 ++--
 net/tor/distinfo                  |   3 ++-
 net/tor/patches/patch-Makefile.in |  17 +++++++++++++++++
 3 files changed, 21 insertions(+), 3 deletions(-)

diffs (46 lines):

diff -r af54c89c4b1e -r 0fcd6e3c2b60 net/tor/Makefile
--- a/net/tor/Makefile  Sun Mar 24 21:40:15 2019 +0000
+++ b/net/tor/Makefile  Mon Mar 25 00:36:06 2019 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.138 2019/03/19 15:44:19 wiz Exp $
+# $NetBSD: Makefile,v 1.139 2019/03/25 00:36:06 gdt Exp $
 
 DISTNAME=      tor-0.3.5.8
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    net security
 MASTER_SITES=  https://dist.torproject.org/
 
diff -r af54c89c4b1e -r 0fcd6e3c2b60 net/tor/distinfo
--- a/net/tor/distinfo  Sun Mar 24 21:40:15 2019 +0000
+++ b/net/tor/distinfo  Mon Mar 25 00:36:06 2019 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.97 2019/02/22 08:47:51 adam Exp $
+$NetBSD: distinfo,v 1.98 2019/03/25 00:36:06 gdt Exp $
 
 SHA1 (tor-0.3.5.8.tar.gz) = 43ce6638a54190b58b62537e1c0892f95552d407
 RMD160 (tor-0.3.5.8.tar.gz) = f94869f6f11277a7c786f8355c528912ab55733b
 SHA512 (tor-0.3.5.8.tar.gz) = 47a21cdd6d4563dd9bfb43c26f054f00747d069611dc9b16eb11b9653fab5c0133fb8bd30e162fa27d90d6bc4f88c0e2bf49eb4fe54529017d5eb87c3bb86132
 Size (tor-0.3.5.8.tar.gz) = 6994335 bytes
+SHA1 (patch-Makefile.in) = 112331d65db45e9282110148b2e6f2bd1b8169ad
diff -r af54c89c4b1e -r 0fcd6e3c2b60 net/tor/patches/patch-Makefile.in
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/tor/patches/patch-Makefile.in Mon Mar 25 00:36:06 2019 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-Makefile.in,v 1.1 2019/03/25 00:36:06 gdt Exp $
+
+In addition to the two files said to depend on micro-revision.i, there
+is a third not listed, causing frequent build failures.
+
+\todo Send upstream after evaluating the fix for correctness.
+
+--- Makefile.in.orig   2019-02-21 15:27:23.000000000 +0000
++++ Makefile.in
+@@ -20088,6 +20088,7 @@ uninstall-man: uninstall-man1
+ # Declare that these object files depend on micro-revision.i.  Without this
+ # rule, we could try to build them before micro-revision.i was created.
+ src/lib/log/git_revision.$(OBJEXT) \
++  src/lib/log/libtor_log_testing_a-git_revision.$(OBJEXT) \
+   src/lib/log/src_lib_libtor_log_testing_a-git_revision.$(OBJEXT): \
+       micro-revision.i
+ 



Home | Main Index | Thread Index | Old Index