CVS commit: pkgsrc/lang/rust-bin

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Wed Sep  8 02:36:18 UTC 2021

Modified Files:
        pkgsrc/lang/rust-bin: Makefile

Log Message:
rust-bin: fix FreeBSD and NetBSD packaging of some binaries

Re-do my previous Linux packaging fix in r. 1.26. FreeBSD and NetBSD
both don't need a particular code block that runs patchelf; doing so
only mangles the resulting binaries, so things can be simplified.


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 pkgsrc/lang/rust-bin/Makefile

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

Modified files:

Index: pkgsrc/lang/rust-bin/Makefile
diff -u pkgsrc/lang/rust-bin/Makefile:1.26 pkgsrc/lang/rust-bin/Makefile:1.27
--- pkgsrc/lang/rust-bin/Makefile:1.26  Wed Aug 25 02:33:00 2021
+++ pkgsrc/lang/rust-bin/Makefile       Wed Sep  8 02:36:18 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2021/08/25 02:33:00 gutteridge Exp $
+# $NetBSD: Makefile,v 1.27 2021/09/08 02:36:18 gutteridge Exp $
 
 DISTNAME=      rust-1.52.1
 PKGNAME=       ${DISTNAME:S/rust/rust-bin/1}
@@ -204,13 +204,6 @@ FORCE_RPATH=               --force-rpath
 .    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:
@@ -218,11 +211,14 @@ fix-relative-rpath:
        ${PREFIX}/bin/patchelf ${FORCE_RPATH} --set-rpath \
                ${PREFIX}/lib ${DESTDIR}${PREFIX}/bin/${bin}
 .  endfor
-.  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
+# 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
+        ${PREFIX}/bin/patchelf ${FORCE_RPATH} --set-rpath ${RUST_LLVM_RPATH} \
+          ${DESTDIR}${PREFIX}/lib/rustlib/${RUST_ARCH}/bin/${bin}
+.    endfor
+.  endif
 .  for lib in lib lib/rustlib/${RUST_ARCH}/lib \
                lib/rustlib/${RUST_ARCH}/codegen-backends
        for f in ${DESTDIR}${PREFIX}/${lib}/lib*.so; do                 \