Attachment 244949 Details for Bug 273798 – GIve the user the option to depend on elfutils

[patch] GIve the user the option to depend on elfutils

0001-devel-binutils-Add-devel-elfutils-dependency-options.patch (text/plain), 2.62 KB, created by Cy Schubert on 2023-09-17 04:08:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Cy Schubert

Created: 2023-09-17 04:08:49 UTC

Size: 2.62 KB

patch

obsolete

>From a48e6dc527235841c5f2f5bcbe94d78a4f0ff31c Mon Sep 17 00:00:00 2001
>From: Cy Schubert <cy@FreeBSD.org>
>Date: Sat, 16 Sep 2023 18:40:57 -0700
>Subject: [PATCH] devel/binutils: Add devel/elfutils dependency options
>
>Currently binutils auto-discovers libdebuginfod.so existence in
>$LOCALBASE and if found, it will use it. This doesn't matter when
>building under poudriere because devel/elfutils is never
>pre-installed as a dependency.
>
>However users building binutils on systems with a pre-installed
>devel/elfutils will discover that binutils will auto-detect the
>existence of libdebuginfod.so and use it. This is not always desired.
>Therefore add an option so that users who build binuitls by hand
>can optionally force binutils not to detect or use libdebuginfod.so.
>
>On the flip side other users may want to depend on devel/elfutils and
>have the ports infrastructure preinstall it for them.
>
>The default option is to auto-detect and depend on devel/elfutils if
>found.
>
>PR:		273798
>---
> devel/binutils/Makefile | 13 +++++++++++++
> 1 file changed, 13 insertions(+)
>
>diff --git a/devel/binutils/Makefile b/devel/binutils/Makefile
>index 7114e9a98614..b99dd170dd84 100644
>--- a/devel/binutils/Makefile
>+++ b/devel/binutils/Makefile
>@@ -51,6 +51,9 @@ LDFLAGS+=	-Wl,--undefined-version
> CONFLICTS=	libbfd
> 
> OPTIONS_DEFINE=	NLS RELRO
>+OPTIONS_DEFAULT=	ELFU_AUTO
>+OPTIONS_RADIO=	ELFUTILS_ENABLE
>+OPTIONS_RADIO_ELFUTILS_ENABLE=	ELFU_AUTO ELFU_YES ELFU_NO
> OPTIONS_SUB=	yes
> 
> RELRO_DESC=	Enable relocation memory corruption mitigation (-z relro) by default
>@@ -58,6 +61,11 @@ RELRO_CONFIGURE_ON=	--enable-relro
> RELRO_CONFIGURE_OFF=	--enable-relro=no
> NLS_USES=	gettext
> NLS_CONFIGURE_ENABLE=	nls
>+ELFU_AUTO_DESC=	Auto-detect pre-installed devel/elfutils
>+ELFU_YES_DESC=	Depend on and install devel/elfutils
>+ELFU_YESLIB_DEPENDS=	libdebuginfod.so:devel/elfutils
>+ELFU_NO_DESC=	Ingore pre-installed devel/elfutils
>+ELFU_NO_CONFIGURE_ON=	--without-libelf --without-debuginfod
> 
> aarch64_COMMENT=	GNU binutils for ${FLAVOR} development
> 
>@@ -127,6 +135,11 @@ INFO=		as \
> 
> .include <bsd.port.pre.mk>
> 
>+# In case devel/elfutils has been previously installed.
>+.if ${PORT_OPTIONS:MELFU_AUTO} && exists(${LOCALBASE}/lib/libdebuginfod.so)
>+LIB_DEPENDS+=	libdebuginfod.so:devel/elfutils
>+.endif
>+
> # Actual earliest version may differ slightly
> .if (${ARCH} != sparc64 && ${ARCH} != mips && ${ARCH} != mips64 && ${ARCH} != powerpcspe && ${ARCH} != powerpc && ${ARCH} != powerpc64 && ${ARCH} != riscv64 && !defined(PKGNAMEPREFIX)) || ((${ARCH} == powerpc || ${ARCH} == powerpc64) && ${CHOSEN_COMPILER_TYPE} != gcc && !defined(PKGNAMEPREFIX))
> CONFIGURE_ARGS+=	--enable-gold --enable-plugins
>-- 
>2.41.0
>

Actions: View | Diff

Attachments on bug 273798: 244905 | 244947 | 244949