CVS commit: pkgsrc/lang

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Tue Jul 30 18:01:16 UTC 2024

Modified Files:
        pkgsrc/lang/rust: Makefile
        pkgsrc/lang/rust176: Makefile

Log Message:
rust: fix build when curl has libssh2 option enabled

PR pkg/58506 from Phil Krylov


To generate a diff of this commit:
cvs rdiff -u -r1.312 -r1.313 pkgsrc/lang/rust/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/rust176/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.312 pkgsrc/lang/rust/Makefile:1.313
--- pkgsrc/lang/rust/Makefile:1.312     Mon Jul 15 03:32:23 2024
+++ pkgsrc/lang/rust/Makefile   Tue Jul 30 18:01:15 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.312 2024/07/15 03:32:23 wiz Exp $
+# $NetBSD: Makefile,v 1.313 2024/07/30 18:01:15 tnn Exp $
 
 DISTNAME=      rustc-1.79.0-src
 PKGNAME=       ${DISTNAME:S/rustc/rust/:S/-src//}
@@ -65,12 +65,6 @@ CONFIGURE_ARGS+=     --enable-vendor
 # cargo defaults to using the number of available CPUs
 MAKE_ENV+=             CARGO_BUILD_JOBS=${_MAKE_JOBS_N}
 
-# Rust builds some bundled components with strict version requirements, ensure
-# that any conflicting packages pulled in via dependencies are not buildlinked.
-BUILDLINK_FILES_CMD.libssh2=   ${TRUE}
-BUILDLINK_FILES_CMD.xz=                ${TRUE}
-MAKE_ENV+=                     LZMA_API_STATIC=1
-
 # MacOS X 10.7 is the oldest supported version. See
 # ${WRKSRC}/src/bootstrap/lib.rs
 MAKE_ENV.Darwin+=      MACOSX_DEPLOYMENT_TARGET="10.7"
@@ -492,6 +486,13 @@ provide-libgcc-for-bootstrap:
 .  endif
 .endif
 
+# Rust builds some bundled components with strict version requirements, ensure
+# that any conflicting packages pulled in via dependencies are not buildlinked.
+BUILDLINK_FILES_CMD.xz=                ${TRUE}
+MAKE_ENV+=                     LZMA_API_STATIC=1
+pre-configure:
+       ${RM} -rf ${BUILDLINK_DIR}/include/libssh2*
+
 #
 # These are essentially copies of the "all", "test", and "install" Makefile
 # targets, but are duplicated here so that we can specify -j.

Index: pkgsrc/lang/rust176/Makefile
diff -u pkgsrc/lang/rust176/Makefile:1.2 pkgsrc/lang/rust176/Makefile:1.3
--- pkgsrc/lang/rust176/Makefile:1.2    Mon Jul  8 14:46:23 2024
+++ pkgsrc/lang/rust176/Makefile        Tue Jul 30 18:01:15 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2024/07/08 14:46:23 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2024/07/30 18:01:15 tnn Exp $
 
 DISTNAME=      rustc-1.76.0-src
 PKGNAME=       ${DISTNAME:S/rustc/rust/:S/-src//}
@@ -66,12 +66,6 @@ CONFIGURE_ARGS+=     --enable-vendor
 # cargo defaults to using the number of available CPUs
 MAKE_ENV+=             CARGO_BUILD_JOBS=${_MAKE_JOBS_N}
 
-# Rust builds some bundled components with strict version requirements, ensure
-# that any conflicting packages pulled in via dependencies are not buildlinked.
-BUILDLINK_FILES_CMD.libssh2=   ${TRUE}
-BUILDLINK_FILES_CMD.xz=                ${TRUE}
-MAKE_ENV+=                     LZMA_API_STATIC=1
-
 # MacOS X 10.7 is the oldest supported version. See
 # ${WRKSRC}/src/bootstrap/lib.rs
 MAKE_ENV.Darwin+=      MACOSX_DEPLOYMENT_TARGET="10.7"
@@ -528,6 +522,13 @@ provide-libgcc-for-bootstrap:
 .  endif
 .endif
 
+# Rust builds some bundled components with strict version requirements, ensure
+# that any conflicting packages pulled in via dependencies are not buildlinked.
+BUILDLINK_FILES_CMD.xz=                ${TRUE}
+MAKE_ENV+=                     LZMA_API_STATIC=1
+pre-configure:
+       ${RM} -rf ${BUILDLINK_DIR}/include/libssh2*
+
 #
 # These are essentially copies of the "all", "test", and "install" Makefile
 # targets, but are duplicated here so that we can specify -j.