Sat Dec 26 23:39:30 2020 UTC ()
librsvg: Restore default of librsvg-c on ARM

Avoid rust version in pbulk when C version is selected

Follows comments by gdt by email


(nia)
diff -r1.125 -r1.126 pkgsrc/graphics/librsvg/Makefile
diff -r1.3 -r1.4 pkgsrc/graphics/librsvg/available.mk
cvs diff -r1.125 -r1.126 pkgsrc/graphics/librsvg/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/librsvg/Makefile 2020/11/05 09:06:55 1.125
+++ pkgsrc/graphics/librsvg/Makefile 2020/12/26 23:39:30 1.126
@@ -1,29 +1,37 @@ @@ -1,29 +1,37 @@
1# $NetBSD: Makefile,v 1.125 2020/11/05 09:06:55 ryoon Exp $ 1# $NetBSD: Makefile,v 1.126 2020/12/26 23:39:30 nia Exp $
2 2
3DISTNAME= librsvg-2.48.3 3DISTNAME= librsvg-2.48.3
4PKGREVISION= 3 4PKGREVISION= 3
5CATEGORIES= graphics gnome 5CATEGORIES= graphics gnome
6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/librsvg/${PKGVERSION_NOREV:R}/} 6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/librsvg/${PKGVERSION_NOREV:R}/}
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://wiki.gnome.org/LibRsvg 10HOMEPAGE= https://wiki.gnome.org/LibRsvg
11COMMENT= SVG library for GNOME 11COMMENT= SVG library for GNOME
12LICENSE= gnu-lgpl-v2.1 12LICENSE= gnu-lgpl-v2.1
13 13
14MAKE_JOBS_SAFE= NO 14MAKE_JOBS_SAFE= NO
15MAKE_FLAGS+= CARGO_MAKE_JOBS=-j${_MAKE_JOBS_N} 15MAKE_FLAGS+= CARGO_MAKE_JOBS=-j${_MAKE_JOBS_N}
16 16
 17.include "available.mk"
 18
 19# FIXME: librsvg-c should have a different PKGBASE so that the newer rust
 20# version doesn't get mistakenly used in bulk build environments.
 21.if ${LIBRSVG_TYPE:tl} == "c"
 22NOT_FOR_BULK_PLATFORM= *-*-*
 23.endif
 24
17USE_LIBTOOL= yes 25USE_LIBTOOL= yes
18USE_TOOLS+= pkg-config gmake aclocal autoconf automake 26USE_TOOLS+= pkg-config gmake aclocal autoconf automake
19USE_LANGUAGES+= c c++ 27USE_LANGUAGES+= c c++
20GNU_CONFIGURE= yes 28GNU_CONFIGURE= yes
21CONFIGURE_ARGS+= --disable-tools 29CONFIGURE_ARGS+= --disable-tools
22#CONFIGURE_ARGS+= --enable-Bsymbolic=auto 30#CONFIGURE_ARGS+= --enable-Bsymbolic=auto
23CONFIGURE_ARGS+= --disable-Bsymbolic 31CONFIGURE_ARGS+= --disable-Bsymbolic
24 32
25PKGCONFIG_OVERRIDE= librsvg.pc.in 33PKGCONFIG_OVERRIDE= librsvg.pc.in
26 34
27TEST_TARGET= check 35TEST_TARGET= check
28 36
29CARGO_CRATE_DEPENDS+= aho-corasick-0.7.10 37CARGO_CRATE_DEPENDS+= aho-corasick-0.7.10
cvs diff -r1.3 -r1.4 pkgsrc/graphics/librsvg/available.mk (expand / switch to unified diff)

--- pkgsrc/graphics/librsvg/available.mk 2020/12/26 10:02:39 1.3
+++ pkgsrc/graphics/librsvg/available.mk 2020/12/26 23:39:30 1.4
@@ -1,28 +1,29 @@ @@ -1,28 +1,29 @@
1# $NetBSD: available.mk,v 1.3 2020/12/26 10:02:39 nia Exp $ 1# $NetBSD: available.mk,v 1.4 2020/12/26 23:39:30 nia Exp $
2# 2#
3# This mk fragment define LIBRSVG_TYPE variable used in other librsvg mk 3# This mk fragment define LIBRSVG_TYPE variable used in other librsvg mk
4# fragments. 4# fragments.
5# 5#
6# User-settable variables: 6# User-settable variables:
7# 7#
8# LIBRSVG_TYPE 8# LIBRSVG_TYPE
9# Type of used librsvg implementation. 9# Type of used librsvg implementation.
10# 10#
11# Possible values: c rust 11# Possible values: c rust
12# Default: rust on platforms were Rust is supported 12# Default: rust on platforms were Rust is supported
13# 13#
14 14
15.if !defined(LIBRSVG_AVAILABLE_MK) 15.if !defined(LIBRSVG_AVAILABLE_MK)
16LIBRSVG_AVAILABLE_MK= defined 16LIBRSVG_AVAILABLE_MK= defined
17 17
18.include "../../mk/bsd.prefs.mk" 18.include "../../mk/bsd.prefs.mk"
19 19
20.include "../../lang/rust/platform.mk" 20.include "../../lang/rust/platform.mk"
21# https://mail-index.netbsd.org/tech-pkg/2020/06/16/msg023380.html 21# https://mail-index.netbsd.org/tech-pkg/2020/06/16/msg023380.html
22.if !empty(PLATFORM_SUPPORTS_RUST:M[Yy][Ee][Ss]) 22.if !empty(PLATFORM_SUPPORTS_RUST:M[Yy][Ee][Ss]) && \
 23 empty(MACHINE_PLATFORM:MNetBSD-*-earm*)
23LIBRSVG_TYPE?= rust 24LIBRSVG_TYPE?= rust
24.else 25.else
25LIBRSVG_TYPE?= c 26LIBRSVG_TYPE?= c
26.endif 27.endif
27 28
28.endif # LIBRSVG_AVAILABLE_MK 29.endif # LIBRSVG_AVAILABLE_MK