pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/net/syncthing Make invocations of the go tool also use...
details: https://anonhg.NetBSD.org/pkgsrc/rev/2cbee5dd56d5
branches: trunk
changeset: 382915:2cbee5dd56d5
user: bsiegert <bsiegert%pkgsrc.org@localhost>
date: Tue Jul 17 19:20:42 2018 +0000
description:
Make invocations of the go tool also use the correct path.
Fixes building (hopefully for good) if pkg_alternative is not installed.
Reported by wiz@
diffstat:
net/syncthing/Makefile | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diffs (18 lines):
diff -r c2e8cdac4ea1 -r 2cbee5dd56d5 net/syncthing/Makefile
--- a/net/syncthing/Makefile Tue Jul 17 19:17:17 2018 +0000
+++ b/net/syncthing/Makefile Tue Jul 17 19:20:42 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.71 2018/07/15 16:26:07 bsiegert Exp $
+# $NetBSD: Makefile,v 1.72 2018/07/17 19:20:42 bsiegert Exp $
# Upstream regularly breaks protocol compatibility. While users of
# pkgsrc syncthing on multiple systems can update synchronously, an
@@ -69,6 +69,8 @@
SUBST_FILES.version= build.go
SUBST_SED.version= -e 's|runError("git", "describe", "--always", "--dirty")|runError("echo","v${PKGVERSION_NOREV}")|'
SUBST_SED.version+= -e 's|runError("git", "show", "-s", "--format=%ct")|runError("false")|'
+SUBST_SED.version+= -e 's|"go"|"${GO}"|'
+
# Create WRKPLACE's parent, but not WRKPLACE. Move the contents of
# the distribution tarball to the directory name desired by upstream's
Home |
Main Index |
Thread Index |
Old Index