Attachment 226910 Details for Bug 257588 – v1 (use "git am")

[patch] v1 (use "git am")

0001-multimedia-librav1e-add-BINARY_ALIAS-for-CC-and-LD.patch (text/plain), 1.52 KB, created by Ghost on 2021-08-03 15:07:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ghost

Created: 2021-08-03 15:07:55 UTC

Size: 1.52 KB

patch

obsolete

>From 2b7d7f8fecb6701d5e015eff6284c94b4acc0d32 Mon Sep 17 00:00:00 2001
>From: Evgeniy Khramtsov <evgeniy@khramtsov.org>
>Date: Tue, 3 Aug 2021 12:10:03 +0300
>Subject: [PATCH] multimedia/librav1e: add BINARY_ALIAS for CC and LD
>
>Add BINARY_ALIAS to respect CC and LD when using lang/rust
>from pkg.FreeBSD.org, e.g. pkg seeding. While here, also pet
>portlint by adding USE_LDCONFIG.
>
>lang/rust hardcodes environment at build time, resulting in
>multimedia/librav1e build failure if the hardcoded CC and LD
>differ from the configured CC and LD, and the system toolchain
>does not exist and is provided by ports:
>
>   Compiling autocfg v1.0.1
>   Compiling libc v0.2.92
>   Compiling rayon-core v1.9.0
>   Compiling cfg-if v1.0.0
>   Compiling proc-macro2 v1.0.24
>   Compiling memchr v2.3.4
>   Compiling unicode-xid v0.2.1
>error: linker `cc` not found
>  |
>  = note: No such file or directory (os error 2)
>
>error: aborting due to previous error
>
>error: could not compile `rayon-core`
>
>PR: XXXXXX
>---
> multimedia/librav1e/Makefile | 3 +++
> 1 file changed, 3 insertions(+)
>
>diff --git a/multimedia/librav1e/Makefile b/multimedia/librav1e/Makefile
>index 2d0519504967..429b9fb8f5f9 100644
>--- a/multimedia/librav1e/Makefile
>+++ b/multimedia/librav1e/Makefile
>@@ -4,7 +4,10 @@ PKGNAMEPREFIX=	lib
> MASTERDIR=	${.CURDIR}/../rav1e
> PLIST=		${.CURDIR}/pkg-plist
> 
>+# lang/rust hardcodes CC and LD
>+BINARY_ALIAS=	cc="${CC}" ld="${LD}"
> BUILD_DEPENDS=	cargo-cbuild:devel/cargo-c
>+USE_LDCONFIG=	yes
> 
> PLIST_FILES=	# empty
> PLIST_SUB=	VERSION=${DISTVERSION:C/-.*//}
>-- 
>2.32.0
>

Actions: View | Diff

Attachments on bug 257588: 226910