Skip to content

Commit 8cce41a

Browse files
committed
rust: address some pkglint nits
(There are more, but these were low-hanging fruit.)
1 parent 4e3fd5c commit 8cce41a

2 files changed

Lines changed: 5 additions & 6 deletions

File tree

lang/rust/Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $NetBSD: Makefile,v 1.353 2026/02/06 10:05:10 wiz Exp $
1+
# $NetBSD: Makefile,v 1.354 2026/02/12 01:35:36 gutteridge Exp $
22

33
DISTNAME= rustc-1.91.1-src
44
PKGNAME= ${DISTNAME:S/rustc/rust/:S/-src//}
@@ -645,7 +645,8 @@ do-install:
645645
.endif
646646

647647
.if ${MACHINE_PLATFORM:MNetBSD-*-i386}
648-
# Turn off Address space layout randomization
648+
USE_TOOLS+= paxctl
649+
# Turn off address space layout randomization
649650
# so that we can build firefox natively:
650651
post-install:
651652
paxctl +a ${DESTDIR}${PREFIX}/bin/rustc

lang/rust/options.mk

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $NetBSD: options.mk,v 1.51 2026/01/18 00:42:57 ryoon Exp $
1+
# $NetBSD: options.mk,v 1.52 2026/02/12 01:35:36 gutteridge Exp $
22

33
PKG_OPTIONS_VAR= PKG_OPTIONS.rust
44
PKG_SUPPORTED_OPTIONS+= rust-cargo-static rust-docs
@@ -65,14 +65,13 @@ GCC_REQD+= 14
6565
# Use the internal copy of LLVM or the external one?
6666
#
6767
.if empty(PKG_OPTIONS:Mrust-internal-llvm)
68-
BUILDLINK_API_DEPENDS.llvm+= llvm>=18.0.0
6968
.include "../../lang/libunwind/buildlink3.mk"
7069
.include "../../lang/llvm/buildlink3.mk"
7170
CONFIGURE_ARGS+= --enable-llvm-link-shared
7271
CONFIGURE_ARGS+= --llvm-libunwind=system
7372
CONFIGURE_ARGS+= --llvm-root=${BUILDLINK_PREFIX.llvm}
7473
# Also turn off build of the internal LLD, as the external LLVM
75-
# may be older (e.g. 18) than the internal LLD (now 19.x), ref.
74+
# may be older (e.g., 18) than the internal LLD (now 19.x), ref.
7675
# https://github.com/rust-lang/rust/issues/131291
7776
CONFIGURE_ARGS+= --set rust.lld=false
7877
.endif
@@ -87,7 +86,6 @@ CONFIGURE_ARGS+= --enable-cargo-native-static
8786
BUILDLINK_API_DEPENDS.nghttp2+= nghttp2>=1.41.0
8887
BUILDLINK_API_DEPENDS.curl+= curl>=7.67.0
8988
.include "../../www/curl/buildlink3.mk"
90-
BUILDLINK_API_DEPENDS.openssl= openssl>=3
9189
RUSTFLAGS+= -C link-arg=-L${BUILDLINK_PREFIX.openssl}/lib
9290
RUSTFLAGS+= -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib
9391
MAKE_ENV+= RUSTFLAGS=${RUSTFLAGS:Q}

0 commit comments

Comments
 (0)