pkgsrc-Changes archive

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

CVS commit: pkgsrc/lang/rust



Module Name:    pkgsrc
Committed By:   jperkin
Date:           Sat Dec 17 21:29:44 UTC 2022

Modified Files:
        pkgsrc/lang/rust: Makefile

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.275 -r1.276 pkgsrc/lang/rust/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/rust/Makefile
diff -u pkgsrc/lang/rust/Makefile:1.275 pkgsrc/lang/rust/Makefile:1.276
--- pkgsrc/lang/rust/Makefile:1.275     Mon Dec  5 21:44:58 2022
+++ pkgsrc/lang/rust/Makefile   Sat Dec 17 21:29:44 2022
@@ -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 @@ CONFIGURE_ARGS+=      --enable-vendor
 # 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