pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/lang/rust-bin rust-bin: Linux repackaging fix



details:   https://anonhg.NetBSD.org/pkgsrc/rev/c7ddb359e047
branches:  trunk
changeset: 457408:c7ddb359e047
user:      gutteridge <gutteridge%pkgsrc.org@localhost>
date:      Wed Aug 25 02:33:00 2021 +0000

description:
rust-bin: Linux repackaging fix

Some upstream-provided binaries weren't covered in a code block that
uses patch-elf to tinker with their RPATH entries. There's also an
extra binary provided vs. the NetBSD package, and possibly those for
other OSes. (I don't have Darwin or FreeBSD test environments; those
OSes could need tweaking for this, too.)

diffstat:

 lang/rust-bin/Makefile |  13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diffs (34 lines):

diff -r 316e1ec1ea2a -r c7ddb359e047 lang/rust-bin/Makefile
--- a/lang/rust-bin/Makefile    Wed Aug 25 00:12:06 2021 +0000
+++ b/lang/rust-bin/Makefile    Wed Aug 25 02:33:00 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2021/08/21 22:06:29 gutteridge Exp $
+# $NetBSD: Makefile,v 1.26 2021/08/25 02:33:00 gutteridge Exp $
 
 DISTNAME=      rust-1.52.1
 PKGNAME=       ${DISTNAME:S/rust/rust-bin/1}
@@ -204,6 +204,13 @@
 .    include "../../devel/libatomic/buildlink3.mk"
 .  endif
 
+# Upstream packages for Linux ship with an extra binary vs. some other OSes.
+.  if ${OPSYS} == "Linux"
+RUST_BIN_EXTRA=        rust-lld
+.  else
+RUST_BIN_EXTRA=        # empty
+.  endif
+
 .PHONY: fix-relative-rpath
 post-install: fix-relative-rpath
 fix-relative-rpath:
@@ -211,8 +218,8 @@
        ${PREFIX}/bin/patchelf ${FORCE_RPATH} --set-rpath \
                ${PREFIX}/lib ${DESTDIR}${PREFIX}/bin/${bin}
 .  endfor
-.  for bin in llvm-ar llvm-nm llvm-objcopy llvm-objdump \
-       llvm-profdata llvm-readobj llvm-size llvm-strip
+.  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_BIN_EXTRA}
        ${PREFIX}/bin/patchelf ${FORCE_RPATH} --set-rpath ${RUST_LLVM_RPATH} \
                ${DESTDIR}${PREFIX}/lib/rustlib/${RUST_ARCH}/bin/${bin}
 .  endfor



Home | Main Index | Thread Index | Old Index