Received: by mail.netbsd.org (Postfix, from userid 605) id 61FD284DA1; Sun, 4 Apr 2021 09:23:39 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 9BAD084D54 for ; Sun, 4 Apr 2021 09:23:38 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id 9I8ALtBhhvaT for ; Sun, 4 Apr 2021 09:23:38 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 1DA1184D41 for ; Sun, 4 Apr 2021 09:23:38 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 11F8CFA95; Sun, 4 Apr 2021 09:23:38 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_161752821856550" MIME-Version: 1.0 Date: Sun, 4 Apr 2021 09:23:38 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/lang/rust To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20210404092338.11F8CFA95@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_161752821856550 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Sun Apr 4 09:23:38 UTC 2021 Modified Files: pkgsrc/lang/rust: Makefile Log Message: rust: Remove old NetBSD bootstrap workarounds To generate a diff of this commit: cvs rdiff -u -r1.223 -r1.224 pkgsrc/lang/rust/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_161752821856550 Content-Disposition: inline Content-Length: 1568 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/lang/rust/Makefile diff -u pkgsrc/lang/rust/Makefile:1.223 pkgsrc/lang/rust/Makefile:1.224 --- pkgsrc/lang/rust/Makefile:1.223 Sun Apr 4 08:36:04 2021 +++ pkgsrc/lang/rust/Makefile Sun Apr 4 09:23:37 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.223 2021/04/04 08:36:04 he Exp $ +# $NetBSD: Makefile,v 1.224 2021/04/04 09:23:37 nia Exp $ DISTNAME= rustc-1.49.0-src PKGNAME= ${DISTNAME:S/rustc/rust/:S/-src//} @@ -531,27 +531,6 @@ stage0-bootstrap: install #.include "../../www/http-parser/buildlink3.mk" #.include "../../devel/jemalloc/buildlink3.mk" -## Issues specific to: bootstrap AND NetBSD follow - -# rust-1.48.0 i386 bootstraps are built for 8.0 and still depend on -# base OpenSSL for cargo. Pull in compat80 on 9.x and newer. -.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) && empty(OS_VERSION:M8.*) -DEPENDS+= compat80>=0:../../emulators/compat80 -.endif - -# As of 2021-02-25 cargo is only a static binary in x86_64, -# powerpc, and sparc64 bootstraps. -# he@ says this should be fixed after the bootstraps are updated -# to 1.49. -.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || \ - !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64) || \ - !empty(MACHINE_PLATFORM:MNetBSD-*-earmv7hf) -BUILDLINK_API_DEPENDS.nghttp2+= nghttp2>=1.41.0 -BUILDLINK_API_DEPENDS.curl+= curl>=7.67.0 -. include "../../www/curl/buildlink3.mk" -. include "../../security/openssl/buildlink3.mk" -.endif - # This is for when we build natively: .if !empty(MACHINE_PLATFORM:MNetBSD-*-powerpc) || \ !empty(MACHINE_PLATFORM:MNetBSD-*-i386) --_----------=_161752821856550--