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: Workaround upstream "micro-revision.i...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/1b4d7382ec3e
branches:  trunk
changeset: 458033:1b4d7382ec3e
user:      gdt <gdt%pkgsrc.org@localhost>
date:      Tue Sep 07 14:00:52 2021 +0000

description:
net/tor: Workaround upstream "micro-revision.i" bug

There is something wrong in tor's  makefiles which causes:

  src/lib/version/git_revision.c:21:10: fatal error: micro-revision.i: No such file or directory
   #include "micro-revision.i"
            ^~~~~~~~~~~~~~~~~~
  compilation terminated.

obviously by not having built micro-revision.i when that compilation
is done.   This happens reliably for some people and not for others.

This commit adds a comment with the issue in tor's bug tracker, and a
workaround that builds micro-revision.i and then does the normal
build.

No PKGREVISION as this is just a build fix, and should have zero
effect if this built anyway.

ok @wiz

diffstat:

 net/tor/Makefile |  7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diffs (21 lines):

diff -r d2ec5fb55be1 -r 1b4d7382ec3e net/tor/Makefile
--- a/net/tor/Makefile  Tue Sep 07 13:31:47 2021 +0000
+++ b/net/tor/Makefile  Tue Sep 07 14:00:52 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.172 2021/08/17 08:13:44 wiz Exp $
+# $NetBSD: Makefile,v 1.173 2021/09/07 14:00:52 gdt Exp $
 
 DISTNAME=      tor-0.4.6.7
 CATEGORIES=    net security
@@ -18,6 +18,11 @@
 CONFIGURE_ENV+=                CPP=${CPP:Q}
 CONFIGURE_ENV+=                CONFDIR=${PKG_SYSCONFDIR}
 
+# https://gitlab.torproject.org/tpo/core/tor/-/issues/29520
+# Without this workaround, fails reliable with MAKE_JOBS=1 on
+# netbsd-9 amd64.
+BUILD_TARGET=          micro-revision.i all
+
 #============================================================================
 #Testsuite summary for tor 0.4.6.6
 #============================================================================



Home | Main Index | Thread Index | Old Index