CVS commit: pkgsrc/lang/rust

["Havard Eidnes" <he%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   he
Date:           Sat Apr  5 09:46:48 UTC 2025

Modified Files:
        pkgsrc/lang/rust: Makefile

Log Message:
lang/rust: remove use of patchelf, as suggested by riastradh@

This was a misguided attempt at dealing with
https://github.com/rust-lang/rust/issues/133629
which was triggered by trying to run the stage1 rust
compiler from within the build tree, and this use
of patchelf did in fact not fix this problem.
Ref. also
https://mail-index.netbsd.org/pkgsrc-changes/2025/04/02/msg320497.html


To generate a diff of this commit:
cvs rdiff -u -r1.325 -r1.326 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.325 pkgsrc/lang/rust/Makefile:1.326
--- pkgsrc/lang/rust/Makefile:1.325     Mon Feb 24 15:12:49 2025
+++ pkgsrc/lang/rust/Makefile   Sat Apr  5 09:46:48 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.325 2025/02/24 15:12:49 tnn Exp $
+# $NetBSD: Makefile,v 1.326 2025/04/05 09:46:48 he Exp $
 
 DISTNAME=      rustc-1.83.0-src
 PKGNAME=       ${DISTNAME:S/rustc/rust/:S/-src//}
@@ -91,11 +91,6 @@ CHECK_SSP_SUPPORTED= no
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "NetBSD"
-TOOL_DEPENDS+=         patchelf-[0-9]*:../../devel/patchelf
-FORCE_RPATH=           --force-rpath
-.endif
-
 # Allow overriding MAKE_JOBS_SAFE
 # some may chose to mostly build faster,
 # and deal with any failures due to deadlocks
@@ -550,30 +545,11 @@ do-test:
        ${SETENV} ${MAKE_ENV}                                           \
                ${TOOL_PYTHONBIN} ./x.py test -j ${_MAKE_JOBS_N}
 
-PATCH_BINARIES+=       bin/cargo
-PATCH_BINARIES+=       bin/cargo-clippy
-PATCH_BINARIES+=       bin/clippy-driver
-PATCH_BINARIES+=       bin/rust-analyzer
-PATCH_BINARIES+=       bin/rustc
-PATCH_BINARIES+=       bin/rustdoc
-PATCH_BINARIES+=       bin/rustfmt
-PATCH_BINARIES+=       libexec/rust-analyzer-proc-macro-srv
-
 do-install:
        ${RUN}${_ULIMIT_CMD}                                            \
        cd ${WRKSRC} &&                                                 \
        ${SETENV} ${MAKE_ENV} ${INSTALL_ENV}                            \
                ${TOOL_PYTHONBIN} ./x.py install -j ${_MAKE_JOBS_N}
-.if ${OPSYS} == "NetBSD"
-       for bin in ${PATCH_BINARIES}; do                                \
-               f=${DESTDIR}${PREFIX}/$${bin};                          \
-               if [ -f $$f ]; then                                     \
-cmd="${PREFIX}/bin/patchelf ${FORCE_RPATH} --set-rpath ${PREFIX}/lib $$f"; \
-                       echo $$cmd;                                     \
-                       $$cmd;                                          \
-               fi;                                                     \
-       done
-.endif
 
 SUBST_CLASSES+=                destdir
 SUBST_STAGE.destdir=   post-install