[pkgsrc/trunk]: pkgsrc/lang/rust Make a tentative fix for pkg/53671 by placin...

[he <he%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e7dd20645d2e
branches:  trunk
changeset: 314099:e7dd20645d2e
user:      he <he%pkgsrc.org@localhost>
date:      Thu Oct 18 15:35:49 2018 +0000

description:
Make a tentative fix for pkg/53671 by placing the cross compiler
wrapper scripts in ${WRKDIR}/scripts instead of modifying the files/
directory, which conflicts with a read-only pkgsrc.

diffstat:

 lang/rust/Makefile |  27 ++++++++++++++++-----------
 1 files changed, 16 insertions(+), 11 deletions(-)

diffs (50 lines):

diff -r c22dd6a40e32 -r e7dd20645d2e lang/rust/Makefile
--- a/lang/rust/Makefile        Thu Oct 18 15:11:59 2018 +0000
+++ b/lang/rust/Makefile        Thu Oct 18 15:35:49 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2018/10/18 11:49:46 martin Exp $
+# $NetBSD: Makefile,v 1.61 2018/10/18 15:35:49 he Exp $
 
 DISTNAME=      rustc-1.29.1-src
 PKGNAME=       ${DISTNAME:S/rustc/rust/:S/-src//}
@@ -49,11 +49,12 @@
 # host the compiler is supposed to run on.
 # Rust's target designation
 #TARGET=               armv7-unknown-netbsd-eabihf
+#SCRIPTS=              ${WRKDIR}/scripts
 #CONFIGURE_ARGS+=      --host=${TARGET}
 #CONFIGURE_ARGS+=      --target=${TARGET}
-#CONFIGURE_ARGS+=      --set=target.${TARGET}.cc=${.CURDIR}/files/gcc-wrap
-#CONFIGURE_ARGS+=      --set=target.${TARGET}.cxx=${.CURDIR}/files/c++-wrap
-#CONFIGURE_ARGS+=      --set=target.${TARGET}.linker=${.CURDIR}/files/gcc-wrap
+#CONFIGURE_ARGS+=      --set=target.${TARGET}.cc=${SCRIPTS}/gcc-wrap
+#CONFIGURE_ARGS+=      --set=target.${TARGET}.cxx=${SCRIPTS}/c++-wrap
+#CONFIGURE_ARGS+=      --set=target.${TARGET}.linker=${SCRIPTS}/gcc-wrap
 #CONFIGURE_ARGS+=      --set=target.${TARGET}.ar=${CROSS_ROOT}/tools/bin/${GNU_CROSS_TARGET}-ar
 
 # May be required when cross-building on NetBSD
@@ -256,13 +257,17 @@
        ${CP} -f ${WRKSRC}/src/vendor/libc/.cargo-checksum.json.patched \
                ${WRKSRC}/src/vendor/libc/.cargo-checksum.json
 .if ${OPSYS} == "NetBSD"
-       ${RM} -f ${.CURDIR}/files/c++-wrap
-       ${RM} -f ${.CURDIR}/files/clang++-wrap
-       ${RM} -f ${.CURDIR}/files/clang-wrap
-       ${LN} -s ${.CURDIR}/files/gcc-wrap ${.CURDIR}/files/c++-wrap
-       ${LN} -s ${.CURDIR}/files/gcc-wrap ${.CURDIR}/files/clang++-wrap
-       ${LN} -s ${.CURDIR}/files/gcc-wrap ${.CURDIR}/files/clang-wrap
-       ${CHMOD} +x ${.CURDIR}/files/gcc-wrap
+       SDIR=${WRKDIR}/scripts; \
+       ${MKDIR} $${SDIR}; \
+       cd $${SDIR}; \
+       ${RM} -f c++-wrap; \
+       ${RM} -f clang++-wrap; \
+       ${RM} -f clang-wrap; \
+       ${CP} ${.CURDIR}/files/gcc-wrap .; \
+       ${CHMOD} +x gcc-wrap; \
+       ${LN} -s gcc-wrap c++-wrap; \
+       ${LN} -s gcc-wrap clang++-wrap; \
+       ${LN} -s gcc-wrap clang-wrap
 .endif
 
 .if ${OPSYS} != "SunOS"