pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
rust184: remove use of patchelf, as suggested by riastradh@
Module Name: pkgsrc-wip
Committed By: Havard Eidnes <he%NetBSD.org@localhost>
Pushed By: he
Date: Sat Apr 5 09:47:33 2025 +0000
Changeset: dd9f0e2fea301a1b2434d6022f4a0f3fa79b12e0
Modified Files:
rust184/Makefile
Log Message:
rust184: remove use of patchelf, as suggested by riastradh@
This is remnants of a misguided attempt at dealing with
https://github.com/rust-lang/rust/issues/133629
which was triggered by running the stage1 rust compiler
from within the build tree. Ref. also
https://mail-index.netbsd.org/pkgsrc-changes/2025/04/02/msg320497.html
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=dd9f0e2fea301a1b2434d6022f4a0f3fa79b12e0
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
rust184/Makefile | 24 ------------------------
1 file changed, 24 deletions(-)
diffs:
diff --git a/rust184/Makefile b/rust184/Makefile
index 1f21cbf22b..3bacebac57 100644
--- a/rust184/Makefile
+++ b/rust184/Makefile
@@ -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
@@ -581,30 +576,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
Home |
Main Index |
Thread Index |
Old Index