Skip to content

Commit c796d4d

Browse files
committed
rust182-bin: pull over fixes from main pkgsrc: reenable Illumos & fix Darwin.
1 parent bcbe706 commit c796d4d

File tree

2 files changed

+20
-9
lines changed

2 files changed

+20
-9
lines changed

rust182-bin/Makefile

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -183,14 +183,14 @@ SITES.${DF}= ${NETBSD_REPO}
183183
.endif
184184

185185
# Illumos:
186-
#.if !empty(MACHINE_PLATFORM:MSunOS-*-x86_64) || make(distinfo) || make(makesum) || make(mdi)
187-
#RUST_ARCH:= x86_64-unknown-illumos
188-
#DN:= ${DISTNAME}
189-
#EXTRACT_SUFX= .tar.gz
190-
#DF:= ${DN}-${RUST_ARCH}${EXTRACT_SUFX}
191-
#DISTFILES:= ${DISTFILES} ${DF}
192-
#SITES.${DF}= https://us-central.manta.mnx.io/pkgsrc/public/pkg-bootstraps/
193-
#.endif
186+
.if !empty(MACHINE_PLATFORM:MSunOS-*-x86_64) || make(distinfo) || make(makesum) || make(mdi)
187+
RUST_ARCH:= x86_64-unknown-illumos
188+
DN:= ${DISTNAME}
189+
EXTRACT_SUFX= .tar.gz
190+
DF:= ${DN}-${RUST_ARCH}${EXTRACT_SUFX}
191+
DISTFILES:= ${DISTFILES} ${DF}
192+
SITES.${DF}= https://us-central.manta.mnx.io/pkgsrc/public/pkg-bootstraps/
193+
.endif
194194

195195

196196
# Binary still extracts to plain non-nb'ed directory
@@ -210,14 +210,22 @@ do-install:
210210
.PHONY: fix-darwin-install-name
211211
post-install: fix-darwin-install-name
212212
fix-darwin-install-name:
213-
. for bin in clippy-driver miri rls rust-analyzer rustc rustdoc
213+
. for bin in cargo-clippy clippy-driver miri rls rust-analyzer rustc rustdoc rustfmt
214214
otool -XL ${DESTDIR}${PREFIX}/bin/${bin} \
215215
| ${GREP} '@rpath' | while read rpath rest; do \
216216
install_name_tool -change $$rpath \
217217
`${ECHO} $$rpath | ${SED} -e 's,@rpath,${PREFIX}/lib,g'` \
218218
${DESTDIR}${PREFIX}/bin/${bin}; \
219219
done
220220
. endfor
221+
. for libexec in rust-analyzer-proc-macro-srv
222+
otool -XL ${DESTDIR}${PREFIX}/libexec/${libexec} \
223+
| ${GREP} '@rpath' | while read rpath rest; do \
224+
install_name_tool -change $$rpath \
225+
`${ECHO} $$rpath | ${SED} -e 's,@rpath,${PREFIX}/lib,g'` \
226+
${DESTDIR}${PREFIX}/libexec/${libexec}; \
227+
done
228+
. endfor
221229
. for bin in lldb lldb-mi llvm-nm llvm-objcopy llvm-objdump \
222230
llvm-profdata llvm-readobj llvm-size llvm-strip
223231
otool -XL ${DESTDIR}${PREFIX}/lib/rustlib/${RUST_ARCH}/bin/${bin} \

rust182-bin/distinfo

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,9 @@ Size (rust-bin-1.82.0/rust-1.82.0-x86_64-apple-darwin.tar.gz) = 359733549 bytes
4545
BLAKE2s (rust-bin-1.82.0/rust-1.82.0-x86_64-unknown-freebsd.tar.gz) = 2a5ccc8fb5aa1d5ff1bbfd60a169dbba28ab2e7933aac37484534215ed0d5f53
4646
SHA512 (rust-bin-1.82.0/rust-1.82.0-x86_64-unknown-freebsd.tar.gz) = 2e97de2e1d0c9d69662cc151becd478d2b0acaaff42443562f518a4191dadabdf0e165f0b9ae1fe90a8c37114377563d9471da2e631ead6a9b1b8583d57da2d0
4747
Size (rust-bin-1.82.0/rust-1.82.0-x86_64-unknown-freebsd.tar.gz) = 342962316 bytes
48+
BLAKE2s (rust-bin-1.82.0/rust-1.82.0-x86_64-unknown-illumos.tar.gz) = 60e203f8e321751467e7cd354629980e8c3d31a857b333ac2f061cab0151a357
49+
SHA512 (rust-bin-1.82.0/rust-1.82.0-x86_64-unknown-illumos.tar.gz) = 138e6cf5eb3a45aa6631924ddafa5812c3eb1d78d11df6ca7f21e592fd4e80e03137897f194bb8063bc6e105e3604e944cc423a74dfa7eaedc45b92e0d0d3ff9
50+
Size (rust-bin-1.82.0/rust-1.82.0-x86_64-unknown-illumos.tar.gz) = 229164320 bytes
4851
BLAKE2s (rust-bin-1.82.0/rust-1.82.0-x86_64-unknown-linux-gnu.tar.gz) = 6e7ce2e72a8bc69e9458ea802d18b1de5f0e697be2720eef8bc465051f13bc18
4952
SHA512 (rust-bin-1.82.0/rust-1.82.0-x86_64-unknown-linux-gnu.tar.gz) = 0fb69cea8b4ebed5a7859f56b308c743ab094bc04d7266651f8a250bcb262f1c45b2ad2b0e2ee5c854ed35208eafd1f7253a495e55860787ba63396ad6a07133
5053
Size (rust-bin-1.82.0/rust-1.82.0-x86_64-unknown-linux-gnu.tar.gz) = 353103417 bytes

0 commit comments

Comments
 (0)