CVS commit: pkgsrc/net/tor

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Tue Sep  7 14:00:52 UTC 2021

Modified Files:
        pkgsrc/net/tor: Makefile

Log Message:
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


To generate a diff of this commit:
cvs rdiff -u -r1.172 -r1.173 pkgsrc/net/tor/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/tor/Makefile
diff -u pkgsrc/net/tor/Makefile:1.172 pkgsrc/net/tor/Makefile:1.173
--- pkgsrc/net/tor/Makefile:1.172       Tue Aug 17 08:13:44 2021
+++ pkgsrc/net/tor/Makefile     Tue Sep  7 14:00:52 2021
@@ -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_ARGS+=     --sysconfdir=${PKG_SYSC
 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
 #============================================================================