pkgsrc-WIP-changes archive

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

rust182-bin: pull over fixes from main pkgsrc: reenable Illumos & fix Darwin.



Module Name:	pkgsrc-wip
Committed By:	Havard Eidnes <he%NetBSD.org@localhost>
Pushed By:	he
Date:		Sun Feb 2 13:59:01 2025 +0000
Changeset:	c796d4d01d6774ccb1fdcb132d6e53012f7f3793

Modified Files:
	rust182-bin/Makefile
	rust182-bin/distinfo

Log Message:
rust182-bin: pull over fixes from main pkgsrc: reenable Illumos & fix Darwin.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=c796d4d01d6774ccb1fdcb132d6e53012f7f3793

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

diffstat:
 rust182-bin/Makefile | 26 +++++++++++++++++---------
 rust182-bin/distinfo |  3 +++
 2 files changed, 20 insertions(+), 9 deletions(-)

diffs:
diff --git a/rust182-bin/Makefile b/rust182-bin/Makefile
index 65a20a734c..0c3775d529 100644
--- a/rust182-bin/Makefile
+++ b/rust182-bin/Makefile
@@ -183,14 +183,14 @@ SITES.${DF}=	${NETBSD_REPO}
 .endif
 
 # Illumos:
-#.if !empty(MACHINE_PLATFORM:MSunOS-*-x86_64) || make(distinfo) || make(makesum) || make(mdi)
-#RUST_ARCH:=	x86_64-unknown-illumos
-#DN:=		${DISTNAME}
-#EXTRACT_SUFX=	.tar.gz
-#DF:=		${DN}-${RUST_ARCH}${EXTRACT_SUFX}
-#DISTFILES:=	${DISTFILES} ${DF}
-#SITES.${DF}=	https://us-central.manta.mnx.io/pkgsrc/public/pkg-bootstraps/
-#.endif
+.if !empty(MACHINE_PLATFORM:MSunOS-*-x86_64) || make(distinfo) || make(makesum) || make(mdi)
+RUST_ARCH:=	x86_64-unknown-illumos
+DN:=		${DISTNAME}
+EXTRACT_SUFX=	.tar.gz
+DF:=		${DN}-${RUST_ARCH}${EXTRACT_SUFX}
+DISTFILES:=	${DISTFILES} ${DF}
+SITES.${DF}=	https://us-central.manta.mnx.io/pkgsrc/public/pkg-bootstraps/
+.endif
 
 
 # Binary still extracts to plain non-nb'ed directory
@@ -210,7 +210,7 @@ do-install:
 .PHONY: fix-darwin-install-name
 post-install: fix-darwin-install-name
 fix-darwin-install-name:
-.  for bin in clippy-driver miri rls rust-analyzer rustc rustdoc
+.  for bin in cargo-clippy clippy-driver miri rls rust-analyzer rustc rustdoc rustfmt
 	otool -XL ${DESTDIR}${PREFIX}/bin/${bin}			\
 	    | ${GREP} '@rpath' | while read rpath rest; do		\
 		install_name_tool -change $$rpath			\
@@ -218,6 +218,14 @@ fix-darwin-install-name:
 		    ${DESTDIR}${PREFIX}/bin/${bin};			\
 	done
 .  endfor
+.  for libexec in rust-analyzer-proc-macro-srv
+	otool -XL ${DESTDIR}${PREFIX}/libexec/${libexec}		\
+	    | ${GREP} '@rpath' | while read rpath rest; do		\
+		install_name_tool -change $$rpath			\
+		    `${ECHO} $$rpath | ${SED} -e 's,@rpath,${PREFIX}/lib,g'` \
+		    ${DESTDIR}${PREFIX}/libexec/${libexec};		\
+	done
+.  endfor
 .  for bin in lldb lldb-mi llvm-nm llvm-objcopy llvm-objdump 	\
 		llvm-profdata llvm-readobj llvm-size llvm-strip
 	otool -XL ${DESTDIR}${PREFIX}/lib/rustlib/${RUST_ARCH}/bin/${bin} \
diff --git a/rust182-bin/distinfo b/rust182-bin/distinfo
index db0e573eb1..d5116ba9c9 100644
--- a/rust182-bin/distinfo
+++ b/rust182-bin/distinfo
@@ -45,6 +45,9 @@ Size (rust-bin-1.82.0/rust-1.82.0-x86_64-apple-darwin.tar.gz) = 359733549 bytes
 BLAKE2s (rust-bin-1.82.0/rust-1.82.0-x86_64-unknown-freebsd.tar.gz) = 2a5ccc8fb5aa1d5ff1bbfd60a169dbba28ab2e7933aac37484534215ed0d5f53
 SHA512 (rust-bin-1.82.0/rust-1.82.0-x86_64-unknown-freebsd.tar.gz) = 2e97de2e1d0c9d69662cc151becd478d2b0acaaff42443562f518a4191dadabdf0e165f0b9ae1fe90a8c37114377563d9471da2e631ead6a9b1b8583d57da2d0
 Size (rust-bin-1.82.0/rust-1.82.0-x86_64-unknown-freebsd.tar.gz) = 342962316 bytes
+BLAKE2s (rust-bin-1.82.0/rust-1.82.0-x86_64-unknown-illumos.tar.gz) = 60e203f8e321751467e7cd354629980e8c3d31a857b333ac2f061cab0151a357
+SHA512 (rust-bin-1.82.0/rust-1.82.0-x86_64-unknown-illumos.tar.gz) = 138e6cf5eb3a45aa6631924ddafa5812c3eb1d78d11df6ca7f21e592fd4e80e03137897f194bb8063bc6e105e3604e944cc423a74dfa7eaedc45b92e0d0d3ff9
+Size (rust-bin-1.82.0/rust-1.82.0-x86_64-unknown-illumos.tar.gz) = 229164320 bytes
 BLAKE2s (rust-bin-1.82.0/rust-1.82.0-x86_64-unknown-linux-gnu.tar.gz) = 6e7ce2e72a8bc69e9458ea802d18b1de5f0e697be2720eef8bc465051f13bc18
 SHA512 (rust-bin-1.82.0/rust-1.82.0-x86_64-unknown-linux-gnu.tar.gz) = 0fb69cea8b4ebed5a7859f56b308c743ab094bc04d7266651f8a250bcb262f1c45b2ad2b0e2ee5c854ed35208eafd1f7253a495e55860787ba63396ad6a07133
 Size (rust-bin-1.82.0/rust-1.82.0-x86_64-unknown-linux-gnu.tar.gz) = 353103417 bytes


Home | Main Index | Thread Index | Old Index