Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id E41431A923A for ; Sat, 26 Dec 2020 23:39:32 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 1500184D48; Sat, 26 Dec 2020 23:39:32 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 4FD5A84D2D for ; Sat, 26 Dec 2020 23:39:31 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id qDUPrtSoFdPY for ; Sat, 26 Dec 2020 23:39:30 +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 C77A784CE7 for ; Sat, 26 Dec 2020 23:39:30 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id C1202FA9D; Sat, 26 Dec 2020 23:39:30 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1609025970225820" MIME-Version: 1.0 Date: Sat, 26 Dec 2020 23:39:30 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/graphics/librsvg To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20201226233930.C1202FA9D@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1609025970225820 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Sat Dec 26 23:39:30 UTC 2020 Modified Files: pkgsrc/graphics/librsvg: Makefile available.mk Log Message: librsvg: Restore default of librsvg-c on ARM Avoid rust version in pbulk when C version is selected Follows comments by gdt by email To generate a diff of this commit: cvs rdiff -u -r1.125 -r1.126 pkgsrc/graphics/librsvg/Makefile cvs rdiff -u -r1.3 -r1.4 pkgsrc/graphics/librsvg/available.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1609025970225820 Content-Disposition: inline Content-Length: 1760 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/graphics/librsvg/Makefile diff -u pkgsrc/graphics/librsvg/Makefile:1.125 pkgsrc/graphics/librsvg/Makefile:1.126 --- pkgsrc/graphics/librsvg/Makefile:1.125 Thu Nov 5 09:06:55 2020 +++ pkgsrc/graphics/librsvg/Makefile Sat Dec 26 23:39:30 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.125 2020/11/05 09:06:55 ryoon Exp $ +# $NetBSD: Makefile,v 1.126 2020/12/26 23:39:30 nia Exp $ DISTNAME= librsvg-2.48.3 PKGREVISION= 3 @@ -14,6 +14,14 @@ LICENSE= gnu-lgpl-v2.1 MAKE_JOBS_SAFE= NO MAKE_FLAGS+= CARGO_MAKE_JOBS=-j${_MAKE_JOBS_N} +.include "available.mk" + +# FIXME: librsvg-c should have a different PKGBASE so that the newer rust +# version doesn't get mistakenly used in bulk build environments. +.if ${LIBRSVG_TYPE:tl} == "c" +NOT_FOR_BULK_PLATFORM= *-*-* +.endif + USE_LIBTOOL= yes USE_TOOLS+= pkg-config gmake aclocal autoconf automake USE_LANGUAGES+= c c++ Index: pkgsrc/graphics/librsvg/available.mk diff -u pkgsrc/graphics/librsvg/available.mk:1.3 pkgsrc/graphics/librsvg/available.mk:1.4 --- pkgsrc/graphics/librsvg/available.mk:1.3 Sat Dec 26 10:02:39 2020 +++ pkgsrc/graphics/librsvg/available.mk Sat Dec 26 23:39:30 2020 @@ -1,4 +1,4 @@ -# $NetBSD: available.mk,v 1.3 2020/12/26 10:02:39 nia Exp $ +# $NetBSD: available.mk,v 1.4 2020/12/26 23:39:30 nia Exp $ # # This mk fragment define LIBRSVG_TYPE variable used in other librsvg mk # fragments. @@ -19,7 +19,8 @@ LIBRSVG_AVAILABLE_MK= defined .include "../../lang/rust/platform.mk" # https://mail-index.netbsd.org/tech-pkg/2020/06/16/msg023380.html -.if !empty(PLATFORM_SUPPORTS_RUST:M[Yy][Ee][Ss]) +.if !empty(PLATFORM_SUPPORTS_RUST:M[Yy][Ee][Ss]) && \ + empty(MACHINE_PLATFORM:MNetBSD-*-earm*) LIBRSVG_TYPE?= rust .else LIBRSVG_TYPE?= c --_----------=_1609025970225820--