Thu Mar 26 20:05:29 2020 UTC ()
lang/rust: remove trailing slash from dependency path

https://mail-index.netbsd.org/pkgsrc-changes/2020/03/26/msg209490.html

> This causes problems with bulk builds, at least with limited builds, as
> the trailing slash in a package directory name causes pbulk-scan to
> fail with "Invalid path from master" and leads to a hung scan phase.


(rillig)
diff -r1.158 -r1.159 pkgsrc/lang/rust/Makefile
cvs diff -r1.158 -r1.159 pkgsrc/lang/rust/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/rust/Makefile 2020/03/24 20:41:18 1.158
+++ pkgsrc/lang/rust/Makefile 2020/03/26 20:05:29 1.159
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.158 2020/03/24 20:41:18 joerg Exp $ 1# $NetBSD: Makefile,v 1.159 2020/03/26 20:05:29 rillig Exp $
2 2
3DISTNAME= rustc-1.42.0-src 3DISTNAME= rustc-1.42.0-src
4PKGNAME= ${DISTNAME:S/rustc/rust/:S/-src//} 4PKGNAME= ${DISTNAME:S/rustc/rust/:S/-src//}
5PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= lang 6CATEGORIES= lang
7MASTER_SITES= http://static.rust-lang.org/dist/ 7MASTER_SITES= http://static.rust-lang.org/dist/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://www.rust-lang.org/ 10HOMEPAGE= https://www.rust-lang.org/
11COMMENT= Safe, concurrent, practical language 11COMMENT= Safe, concurrent, practical language
12LICENSE= mit OR apache-2.0 12LICENSE= mit OR apache-2.0
13 13
14USE_GCC_RUNTIME= yes 14USE_GCC_RUNTIME= yes
@@ -469,21 +469,21 @@ stage0-bootstrap: install @@ -469,21 +469,21 @@ stage0-bootstrap: install
469#.include "../../www/http-parser/buildlink3.mk" 469#.include "../../www/http-parser/buildlink3.mk"
470#.include "../../devel/jemalloc/buildlink3.mk" 470#.include "../../devel/jemalloc/buildlink3.mk"
471 471
472# Bootstrap built on 8.0, build on later version 472# Bootstrap built on 8.0, build on later version
473# requires compat80 package 473# requires compat80 package
474# (I wish this worked on powerpc, but it doesn't since 474# (I wish this worked on powerpc, but it doesn't since
475# I can't build with the internal LLVM, ref. 475# I can't build with the internal LLVM, ref.
476# https://github.com/rust-lang/rust/issues/65862) 476# https://github.com/rust-lang/rust/issues/65862)
477.if (${OPSYS} == "NetBSD") && \ 477.if (${OPSYS} == "NetBSD") && \
478 ((${MACHINE_ARCH} == "i386") || \ 478 ((${MACHINE_ARCH} == "i386") || \
479 (${MACHINE_ARCH} == "powerpc")) \ 479 (${MACHINE_ARCH} == "powerpc")) \
480 && (empty(OS_VERSION:M[012345678].*) || \ 480 && (empty(OS_VERSION:M[012345678].*) || \
481 !empty(OS_VERSION:M8.99.*)) 481 !empty(OS_VERSION:M8.99.*))
482DEPENDS+= compat80>=0:../../emulators/compat80/ 482DEPENDS+= compat80>=0:../../emulators/compat80
483.endif 483.endif
484 484
485.include "../../devel/zlib/buildlink3.mk" 485.include "../../devel/zlib/buildlink3.mk"
486.include "../../lang/python/tool.mk" 486.include "../../lang/python/tool.mk"
487.include "../../security/openssl/buildlink3.mk" 487.include "../../security/openssl/buildlink3.mk"
488.include "../../www/curl/buildlink3.mk" 488.include "../../www/curl/buildlink3.mk"
489.include "../../mk/bsd.pkg.mk" 489.include "../../mk/bsd.pkg.mk"