diff options
| author | nia <nia@pkgsrc.org> | 2020-12-26 23:39:30 +0000 |
|---|---|---|
| committer | nia <nia@pkgsrc.org> | 2020-12-26 23:39:30 +0000 |
| commit | 1c757d3fd0fdae8c09caab3527b01e5abc8032db (patch) | |
| tree | f6342dc1146a17774466d1226eaeb1f4edf17aee /graphics | |
| parent | 9f24eb4a55eb43890cc26798fe694d95e4e5b7e5 (diff) | |
| download | pkgsrc-1c757d3fd0fdae8c09caab3527b01e5abc8032db.tar.gz | |
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 (limited to 'graphics')
| -rw-r--r-- | graphics/librsvg/Makefile | 10 | ||||
| -rw-r--r-- | graphics/librsvg/available.mk | 5 |
2 files changed, 12 insertions, 3 deletions
diff --git a/graphics/librsvg/Makefile b/graphics/librsvg/Makefile index 8f92fc53d82..044541947e6 100644 --- a/graphics/librsvg/Makefile +++ b/graphics/librsvg/Makefile @@ -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++ diff --git a/graphics/librsvg/available.mk b/graphics/librsvg/available.mk index 07df4103471..0af3caee88a 100644 --- a/graphics/librsvg/available.mk +++ b/graphics/librsvg/available.mk @@ -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 |