From 24db7d8caac531336af1f9c1eb9264d75d4390a1 Mon Sep 17 00:00:00 2001 From: Tobias Kortkamp Date: Fri, 29 Nov 2019 22:12:35 +0000 Subject: [PATCH] lang/rust, Mk/Uses/cargo.mk: Drop gmake build dependency for backtrace-sys The backtrace-sys crate no longer needs gmake since 0.1.20. sysutils/flowgger still uses backtrace-sys-0.1.14. Since it is the only USES=cargo port left that needs it, move the gmake dependency directly to it instead. lang/rust currently has backtrace-sys-0.1.30. It also vendors jemalloc-sys (which also needs gmake to build) but it is hidden behind rustc's jemalloc feature which we do not currently activate. It should be safe to remove gmake in lang/rust too. PR: 242267 Reported by: mikael.urankar@gmail.com --- Mk/Uses/cargo.mk | 4 ---- lang/rust/Makefile | 3 +-- net-im/fractal/Makefile | 2 +- sysutils/flowgger/Makefile | 3 +++ 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Mk/Uses/cargo.mk b/Mk/Uses/cargo.mk index 8e762421c2dd..206440f93600 100644 --- a/Mk/Uses/cargo.mk +++ b/Mk/Uses/cargo.mk @@ -119,10 +119,6 @@ CARGO_TEST_ARGS+= --release CARGO_INSTALL_ARGS+= --debug .endif -.if ${CARGO_CRATES:Mbacktrace-sys-[0-9]*} -BUILD_DEPENDS+= gmake:devel/gmake -.endif - .if ${CARGO_CRATES:Mcmake-[0-9]*} BUILD_DEPENDS+= cmake:devel/cmake .endif diff --git a/lang/rust/Makefile b/lang/rust/Makefile index 6b48300cb60b..1bb3fc9d7d48 100644 --- a/lang/rust/Makefile +++ b/lang/rust/Makefile @@ -35,8 +35,7 @@ IGNORE_FreeBSD_11_powerpc64= is missing a bootstrap for FreeBSD 11.x powerpc64 ONLY_FOR_ARCHS?= aarch64 amd64 armv6 armv7 i386 powerpc64 ONLY_FOR_ARCHS_REASON= requires prebuilt bootstrap compiler -BUILD_DEPENDS= cmake:devel/cmake \ - gmake:devel/gmake +BUILD_DEPENDS= cmake:devel/cmake LIB_DEPENDS= libcurl.so:ftp/curl \ libgit2.so:devel/libgit2 \ libssh2.so:security/libssh2 diff --git a/net-im/fractal/Makefile b/net-im/fractal/Makefile index 251ffd73517d..bb7f9c1d6103 100644 --- a/net-im/fractal/Makefile +++ b/net-im/fractal/Makefile @@ -12,7 +12,7 @@ COMMENT= GTK+ Matrix IM client LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/LICENSE.txt -# gmake for the backtrace-sys crate +# gmake for the gettext-sys crate BUILD_DEPENDS= cargo:lang/${RUST_DEFAULT} \ gmake:devel/gmake LIB_DEPENDS= libdbus-1.so:devel/dbus \ diff --git a/sysutils/flowgger/Makefile b/sysutils/flowgger/Makefile index 51feb7490dc6..70c12f536c14 100644 --- a/sysutils/flowgger/Makefile +++ b/sysutils/flowgger/Makefile @@ -12,6 +12,9 @@ COMMENT= Fast data collector LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/LICENSE +# for backtrace-sys < 0.1.24 +BUILD_DEPENDS= gmake:devel/gmake + USES= cargo ssl USE_GITHUB= yes GH_ACCOUNT= jedisct1