rust179-bin: pull over changes from main pkgsrc to reduce diffs:

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: rust179-bin: pull over changes from main pkgsrc to reduce diffs:
From: Havard Eidnes <he%NetBSD.org@localhost>
Date: Tue, 6 Aug 2024 09:00:41 +0000
Module Name:	pkgsrc-wip
Committed By:	Havard Eidnes <he%NetBSD.org@localhost>
Pushed By:	he
Date:		Tue Aug 6 08:59:12 2024 +0000
Changeset:	1864aaa62f2f7bfb67f2b023d8510415606236e6

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

Log Message:
rust179-bin: pull over changes from main pkgsrc to reduce diffs:

 * Adjust packaging on Linux, tweak rpath of more files & fix DIST_SUBDIR
 * Remove pretenses of supporting NetBSD 8.x, all bootstraps are
   now built for NetBSD 9.x or newer, so simplify BROKEN_ON_PLATFORM.
   Also remove use of compat80, since that is no longer needed.
 * Also adjust RPATH of rust-analyzer and rust-analyzer-proc-macro-srv,
   ref. tech-pkg@.  Fixes packaging on NetBSD/amd64, Linux and FreeBSD.
 * Re-enable x86_64-unknown-illumos.
 * Place the NetBSD-*-x86_64 pattern in the right section
 * Add Linux-*-aarch64 as supported platform (already had rules to install).
 * Add use of libatomic to all the 32-bit NetBSD ports.

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

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

diffstat:
 rust179-bin/Makefile | 59 +++++++++++++++++++++-------------------------------
 rust179-bin/distinfo |  3 +++
 2 files changed, 27 insertions(+), 35 deletions(-)

diffs:
diff --git a/rust179-bin/Makefile b/rust179-bin/Makefile
index b3cd205a5f..e9f8261f46 100644
--- a/rust179-bin/Makefile
+++ b/rust179-bin/Makefile
@@ -4,7 +4,7 @@ DISTNAME=	rust-1.79.0
 PKGNAME=	${DISTNAME:S/rust/rust-bin/1}
 CATEGORIES=	lang
 MASTER_SITES=	https://static.rust-lang.org/dist/
-DIST_SUBDIR=	${PKGNAME}
+DIST_SUBDIR=	${PKGNAME_NOREV}
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://rust-lang.org/
@@ -17,8 +17,10 @@ CONFLICTS+=	rust-[0-9]*
 ONLY_FOR_PLATFORM+=	Darwin-*-aarch64
 ONLY_FOR_PLATFORM+=	Darwin-*-x86_64
 ONLY_FOR_PLATFORM+=	FreeBSD-*-x86_64
+ONLY_FOR_PLATFORM+=	Linux-*-aarch64
 ONLY_FOR_PLATFORM+=	Linux-*-i386
 ONLY_FOR_PLATFORM+=	Linux-*-x86_64
+ONLY_FOR_PLATFORM+=	NetBSD-*-x86_64
 
 # he%NetBSD.org@localhost provided binaries
 ONLY_FOR_PLATFORM+=	NetBSD-*-aarch64
@@ -30,10 +32,9 @@ ONLY_FOR_PLATFORM+=	NetBSD-*-powerpc
 ONLY_FOR_PLATFORM+=	NetBSD-*-sparc64
 #ONLY_FOR_PLATFORM+=	NetBSD-*-mipsel
 ONLY_FOR_PLATFORM+=	NetBSD-*-riscv64
-ONLY_FOR_PLATFORM+=	NetBSD-*-x86_64
 
 # Illumos, jperkin@ provided binaries
-#ONLY_FOR_PLATFORM+=	SunOS-*-x86_64
+ONLY_FOR_PLATFORM+=	SunOS-*-x86_64
 
 NETBSD_REPO=	https://cdn.NetBSD.org/pub/pkgsrc/distfiles/LOCAL_PORTS/rust/
 
@@ -42,10 +43,8 @@ CHECK_RELRO_SKIP+=	lib/rustlib/*/bin/*
 CHECK_SHLIBS_SKIP+=	bin/cargo-clippy
 CHECK_SHLIBS_SKIP+=	bin/rustfmt
 
-# Bootstraps built for 9.0.
-BROKEN_ON_PLATFORM+=	NetBSD-8.*-earmv7hf
-BROKEN_ON_PLATFORM+=	NetBSD-8.*-earmv6hf
-BROKEN_ON_PLATFORM+=	NetBSD-8.*-powerpc
+# Bootstraps built for 9.0 or newer, -8 gcc is too old...
+BROKEN_ON_PLATFORM+=	NetBSD-8.*
 
 # Binary distributions aren't built as PIE.
 MKPIE_SUPPORTED=	no
@@ -188,21 +187,19 @@ 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
 WRKSRC:=	${WRKSRC:C/nb[0-9]*//}
 WRKSRC:=	${WRKSRC:C/-$//}
-# Undo the powerpc netbsd90 thingie...
-WRKSRC:=	${WRKSRC:C/netbsd90/netbsd/}
 
 do-install:
 	cd ${.CURDIR}/files; pax -rw install.sh ${WRKSRC}
@@ -246,26 +243,17 @@ fix-darwin-install-name:
 	done
 .  endfor
 .else
+# Not Darwin:
+
 TOOL_DEPENDS+=		patchelf-[0-9]*:../../devel/patchelf
 
-# The llvm utilities may need a specific libstdc++ version from compat80
-.  if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} >= 090000
-.    if ${MACHINE_ARCH} != "aarch64" && ${MACHINE_ARCH} != "earmv7hf" && \
-        ${MACHINE_ARCH} != "powerpc" && ${MACHINE_ARCH} != "earmv6hf" && \
-        ${MACHINE_ARCH} != "riscv64" && ${MACHINE_ARCH} != "aarch64eb"
-DEPENDS+=		compat80-[0-9]*:../../emulators/compat80
-RUST_LLVM_RPATH=	${PREFIX}/emul/netbsd/usr/lib:${PREFIX}/lib
-FORCE_RPATH=
-.    else
-RUST_LLVM_RPATH=	${PREFIX}/lib
-.    endif
-.  else
-# ld.elf_so in NetBSD 8.x only obeys RPATH, not RUNPATH, so force RPATH there.
 RUST_LLVM_RPATH=	${PREFIX}/lib
 FORCE_RPATH=		--force-rpath
-.  endif
 
+# 32-bit NetBSD ports need libatomic
 .  if !empty(MACHINE_PLATFORM:MNetBSD-*-powerpc) || \
+      !empty(MACHINE_PLATFORM:MNetBSD-*-earmv[67]hf) || \
+      !empty(MACHINE_PLATFORM:MNetBSD-*-mipsel) || \
       !empty(MACHINE_PLATFORM:MNetBSD-*-i386)
 .    include "../../devel/libatomic/buildlink3.mk"
 .  endif
@@ -273,17 +261,18 @@ FORCE_RPATH=		--force-rpath
 .PHONY: fix-relative-rpath
 post-install: fix-relative-rpath
 fix-relative-rpath:
-.  for bin in clippy-driver miri rls rust-analyzer rustc rustdoc
-	if [ -f ${DESTDIR}${PREFIX}/bin/${bin} ]; then \
+.  for bin in bin/clippy-driver bin/miri bin/rls bin/rust-analyzer \
+	bin/rustc bin/rustdoc libexec/rust-analyzer-proc-macro-srv
+	if [ -f ${DESTDIR}${PREFIX}/${bin} ]; then \
 		${PREFIX}/bin/patchelf ${FORCE_RPATH} --set-rpath \
-		    ${PREFIX}/lib ${DESTDIR}${PREFIX}/bin/${bin} ; \
+		    ${PREFIX}/lib ${DESTDIR}${PREFIX}/${bin} ; \
 	fi
 .  endfor
 # Only Linux builds link these binaries against an LLVM library
 .  if ${OPSYS} == "Linux"
 .    for bin in llc llvm-ar llvm-as llvm-cov llvm-dis llvm-nm llvm-objcopy \
 	   llvm-objdump llvm-profdata llvm-readobj llvm-size llvm-strip opt \
-	   rust-lld
+	   rust-lld gcc-ld/ld64.lld gcc-ld/ld.lld gcc-ld/lld-link gcc-ld/wasm-ld
 	 ${PREFIX}/bin/patchelf ${FORCE_RPATH} --set-rpath ${RUST_LLVM_RPATH} \
 	   ${DESTDIR}${PREFIX}/lib/rustlib/${RUST_ARCH}/bin/${bin}
 .    endfor
diff --git a/rust179-bin/distinfo b/rust179-bin/distinfo
index 2827ccd47c..fa01015c5e 100644
--- a/rust179-bin/distinfo
+++ b/rust179-bin/distinfo
@@ -39,6 +39,9 @@ Size (rust-bin-1.79.0/rust-1.79.0-x86_64-apple-darwin.tar.gz) = 338174040 bytes
 BLAKE2s (rust-bin-1.79.0/rust-1.79.0-x86_64-unknown-freebsd.tar.gz) = 2be5e32b34aa254bdf24e59f5f58f7814926db30cf740df52d16b7fd5e08f99c
 SHA512 (rust-bin-1.79.0/rust-1.79.0-x86_64-unknown-freebsd.tar.gz) = 886e21c494d2bcaab307f51c66033bcda76100028804c86fcbb25c5eaab329b4cb05d060350270fc98e1291d6c6fea1dcf0c71668cc74517a4b405f6078c8fa2
 Size (rust-bin-1.79.0/rust-1.79.0-x86_64-unknown-freebsd.tar.gz) = 321707464 bytes
+BLAKE2s (rust-bin-1.79.0/rust-1.79.0-x86_64-unknown-illumos.tar.gz) = 935497255d398ab3264d8be8072836c7934ecdf136007b439b33ff5cbb1fbc25
+SHA512 (rust-bin-1.79.0/rust-1.79.0-x86_64-unknown-illumos.tar.gz) = 992bba31f2a17c9076ac265736f692b700afd957bce2058286930bf180ef01a931f0d56c0834194d245bc826d00bc88e8edb4f3ee3b5048f047e6eaa427b6e1d
+Size (rust-bin-1.79.0/rust-1.79.0-x86_64-unknown-illumos.tar.gz) = 213199204 bytes
 BLAKE2s (rust-bin-1.79.0/rust-1.79.0-x86_64-unknown-linux-gnu.tar.gz) = 62b441a4f50d7cf43ac0fc88d7f8cfa130660e631e7e054fb8ac09add329f497
 SHA512 (rust-bin-1.79.0/rust-1.79.0-x86_64-unknown-linux-gnu.tar.gz) = 70ce4774fea419b09b6ce4cce3de5392070d07db62c05c67964bd5317bf8de521705330c2bbbd6ad8418ca4e1cb37bfce8def83bdde9577fd66a57fbe48bc78e
 Size (rust-bin-1.79.0/rust-1.79.0-x86_64-unknown-linux-gnu.tar.gz) = 329537108 bytes
Prev by Date: antlr: On Linux libantlr.a needs to built with -fPIC
Next by Date: minio: updated to 20240803
Previous by Thread: antlr: On Linux libantlr.a needs to built with -fPIC
Next by Thread: minio: updated to 20240803
Indexes:
Home | Main Index | Thread Index | Old Index