pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang/rust rust: Stop xz being buildlinked.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/0274fb809bb3
branches:  trunk
changeset: 390175:0274fb809bb3
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Sat Dec 17 21:29:44 2022 +0000

description:
rust: Stop xz being buildlinked.

The recent xz update broke the API and rust happened to be using it via other
buildlink3 dependencies, even though we try to use the bundled version.  Set
BUILDLINK_FILES_CMD.xz to ${TRUE} to avoid any xz files from being linked, and
ensuring we use the bundled copy.

diffstat:

 lang/rust/Makefile |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (20 lines):

diff -r 0efbea55223b -r 0274fb809bb3 lang/rust/Makefile
--- a/lang/rust/Makefile        Sat Dec 17 17:51:45 2022 +0000
+++ b/lang/rust/Makefile        Sat Dec 17 21:29:44 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.275 2022/12/05 21:44:58 jperkin Exp $
+# $NetBSD: Makefile,v 1.276 2022/12/17 21:29:44 jperkin Exp $
 
 DISTNAME=      rustc-1.64.0-src
 PKGNAME=       ${DISTNAME:S/rustc/rust/:S/-src//}
@@ -64,7 +64,9 @@
 # cargo defaults to using the number of available CPUs
 MAKE_ENV+=             CARGO_BUILD_JOBS=${_MAKE_JOBS_N}
 
-# Ensure we use a bundled lzma rather than relying on finding one.
+# Ensure we use a bundled lzma rather than relying on finding one, and avoid
+# xz being buildlinked if it's pulled in via dependencies.
+BUILDLINK_FILES_CMD.xz=        ${TRUE}
 MAKE_ENV+=             LZMA_API_STATIC=1
 
 # MacOS X 10.7 is the oldest supported version. See



Home | Main Index | Thread Index | Old Index