Sun Sep 20 22:30:07 2020 UTC ()
lang/urst: Depend on compat80 also on NetBSD/sparc64


(gdt)
diff -r1.191 -r1.192 pkgsrc/lang/rust/Makefile
cvs diff -r1.191 -r1.192 pkgsrc/lang/rust/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/rust/Makefile 2020/08/31 18:09:52 1.191
+++ pkgsrc/lang/rust/Makefile 2020/09/20 22:30:07 1.192
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.191 2020/08/31 18:09:52 wiz Exp $ 1# $NetBSD: Makefile,v 1.192 2020/09/20 22:30:07 gdt Exp $
2 2
3DISTNAME= rustc-1.45.2-src 3DISTNAME= rustc-1.45.2-src
4PKGNAME= ${DISTNAME:S/rustc/rust/:S/-src//} 4PKGNAME= ${DISTNAME:S/rustc/rust/:S/-src//}
5PKGREVISION= 2 5PKGREVISION= 2
6CATEGORIES= lang 6CATEGORIES= lang
7MASTER_SITES= https://static.rust-lang.org/dist/ 7MASTER_SITES= https://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
14CONFLICTS+= rust-bin-[0-9]* 14CONFLICTS+= rust-bin-[0-9]*
@@ -499,31 +499,32 @@ stage0-bootstrap: install @@ -499,31 +499,32 @@ stage0-bootstrap: install
499.endif 499.endif
500 500
501.include "options.mk" 501.include "options.mk"
502 502
503# These dependencies currently use the bundled sources as they require 503# These dependencies currently use the bundled sources as they require
504# development features not yet available in released versions. 504# development features not yet available in released versions.
505# 505#
506#.include "../../devel/libgit2/buildlink3.mk" 506#.include "../../devel/libgit2/buildlink3.mk"
507#.include "../../security/libssh2/buildlink3.mk" 507#.include "../../security/libssh2/buildlink3.mk"
508#.include "../../www/http-parser/buildlink3.mk" 508#.include "../../www/http-parser/buildlink3.mk"
509#.include "../../devel/jemalloc/buildlink3.mk" 509#.include "../../devel/jemalloc/buildlink3.mk"
510 510
511# Bootstrap built on 8.0, build on later version 511# Bootstrap built on 8.0, build on later version
512# requires compat80 package 512# requires compat80 package.
513# (I wish this worked on powerpc, but it doesn't since 513# (I wish this worked on powerpc, but it doesn't since
514# I can't build with the internal LLVM, ref. 514# I can't build with the internal LLVM, ref.
515# https://github.com/rust-lang/rust/issues/65862) 515# https://github.com/rust-lang/rust/issues/65862)
516.if (${OPSYS} == "NetBSD") && \ 516.if (${OPSYS} == "NetBSD") && \
517 ((${MACHINE_ARCH} == "i386") || \ 517 ((${MACHINE_ARCH} == "i386") || \
 518 (${MACHINE_ARCH} == "sparc64") || \
518 (${MACHINE_ARCH} == "powerpc")) \ 519 (${MACHINE_ARCH} == "powerpc")) \
519 && (empty(OS_VERSION:M[012345678].*) || \ 520 && (empty(OS_VERSION:M[012345678].*) || \
520 !empty(OS_VERSION:M8.99.*)) 521 !empty(OS_VERSION:M8.99.*))
521DEPENDS+= compat80>=0:../../emulators/compat80 522DEPENDS+= compat80>=0:../../emulators/compat80
522.endif 523.endif
523 524
524.include "../../devel/zlib/buildlink3.mk" 525.include "../../devel/zlib/buildlink3.mk"
525.include "../../lang/python/tool.mk" 526.include "../../lang/python/tool.mk"
526.include "../../security/openssl/buildlink3.mk" 527.include "../../security/openssl/buildlink3.mk"
527BUILDLINK_API_DEPENDS.curl+= curl>=7.67.0 528BUILDLINK_API_DEPENDS.curl+= curl>=7.67.0
528.include "../../www/curl/buildlink3.mk" 529.include "../../www/curl/buildlink3.mk"
529.include "../../mk/bsd.pkg.mk" 530.include "../../mk/bsd.pkg.mk"