[pkgsrc/trunk]: pkgsrc/graphics/librsvg librsvg: Restore default of librsvg-c...

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7ed6fdd8c047
branches:  trunk
changeset: 443839:7ed6fdd8c047
user:      nia <nia%pkgsrc.org@localhost>
date:      Sat Dec 26 23:39:30 2020 +0000

description:
librsvg: Restore default of librsvg-c on ARM

Avoid rust version in pbulk when C version is selected

Follows comments by gdt by email

diffstat:

 graphics/librsvg/Makefile     |  10 +++++++++-
 graphics/librsvg/available.mk |   5 +++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diffs (43 lines):

diff -r 8dc94996c8aa -r 7ed6fdd8c047 graphics/librsvg/Makefile
--- a/graphics/librsvg/Makefile Sat Dec 26 19:54:14 2020 +0000
+++ b/graphics/librsvg/Makefile Sat Dec 26 23:39:30 2020 +0000
@@ -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 @@
 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++
diff -r 8dc94996c8aa -r 7ed6fdd8c047 graphics/librsvg/available.mk
--- a/graphics/librsvg/available.mk     Sat Dec 26 19:54:14 2020 +0000
+++ b/graphics/librsvg/available.mk     Sat Dec 26 23:39:30 2020 +0000
@@ -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 @@
 
 .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