Attachment 221905 Details for Bug 252998 – Allow building devel/elfutils and devel/dwarves on FreeBSD-11-based systems

[patch] Allow building devel/elfutils and devel/dwarves on FreeBSD-11-based systems

allow-building-dwarfes-and-elfutils-on-freebsd-11.diff (text/plain), 2.58 KB, created by Fabian Keil on 2021-01-25 14:47:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Fabian Keil

Created: 2021-01-25 14:47:40 UTC

Size: 2.58 KB

patch

obsolete

>From 28c3ac100280b53cbf1698188f1210d148280f05 Mon Sep 17 00:00:00 2001
>From: Fabian Keil <fk@fabiankeil.de>
>Date: Thu, 21 Jan 2021 10:09:43 +0100
>Subject: [PATCH 1/2] devel/elfutils: Support building on FreeBSD-11-based
> systems again
>
>... by using the fallback atomics shipped with elfutils.
>---
> devel/elfutils/Makefile | 12 +++++++++++-
> 1 file changed, 11 insertions(+), 1 deletion(-)
>
>diff --git a/devel/elfutils/Makefile b/devel/elfutils/Makefile
>index 5118ddc9f0b2..ce2caa519a4f 100644
>--- a/devel/elfutils/Makefile
>+++ b/devel/elfutils/Makefile
>@@ -15,7 +15,6 @@ LICENSE_FILE_GPLv3+ =	${WRKSRC}/COPYING
> LICENSE_FILE_GPLv2+ =	${WRKSRC}/COPYING-GPLV2
> LICENSE_FILE_LGPL3=	${WRKSRC}/COPYING-LGPLV3
> 
>-IGNORE_FreeBSD_11=	fails to build: fails to compile dwarf_abbrev_hash.c
> BROKEN_armv6=		fails to build: fails to compile i386_disasm.c
> BROKEN_armv7=		fails to build: fails to compile i386_disasm.c
> BROKEN_sparc64=		sparc patch does not apply cleanly to 0.172
>@@ -43,12 +42,23 @@ CFLAGS+=	-Wno-null-dereference -Wno-unused-value
> CFLAGS+=	-Wno-cast-function-type
> # Give i386 a prayer of building, and we can fix the warnings later:
> CFLAGS_i386+=	-Wno-error
>+.if ${OSVERSION} < 1200000
>+# Ignore complaints about function redifinitions
>+CFLAGS+=	-Wno-error
>+.endif
> 
> # Avoid conflict with binutils / elftoolchain programs with the same names:
> CONFIGURE_ARGS+=	--program-prefix=eu-
> # Disable debuginfod until option support can be added:
> CONFIGURE_ARGS+=	--disable-debuginfod
> 
>+post-patch:
>+.if ${OSVERSION} < 1200000
>+# Use the fallback atomics shipped in the distfile
>+	${REINPLACE_CMD} -e 's@HAVE_STDATOMIC_H@HAVE_STDATOMIC_H_@' \
>+		${WRKSRC}/lib/atomics.h
>+.endif
>+
> pre-configure:
> 	@${CP} -a \
> 	    ${LOCALBASE}/share/gnulib/lib/obstack.c \
>-- 
>2.30.0
>
>
>From 08f360cba5d9835b03135a770bb8db21e255bd49 Mon Sep 17 00:00:00 2001
>From: Fabian Keil <fk@fabiankeil.de>
>Date: Thu, 21 Jan 2021 10:48:01 +0100
>Subject: [PATCH 2/2] devel/dwarves: Allow to build on FreeBSD-11-based systems
>
>... as the dependency devel/elfutils builds now.
>---
> devel/dwarves/Makefile | 2 --
> 1 file changed, 2 deletions(-)
>
>diff --git a/devel/dwarves/Makefile b/devel/dwarves/Makefile
>index 91c519899227..3f512cca780b 100644
>--- a/devel/dwarves/Makefile
>+++ b/devel/dwarves/Makefile
>@@ -15,8 +15,6 @@ LICENSE_FILE_BSD2CLAUSE=	${WRKSRC}/lib/bpf/LICENSE.BSD-2-Clause
> LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING
> LICENSE_FILE_LGPL21=	${WRKSRC}/lib/bpf/LICENSE.LPGL-2.1
> 
>-IGNORE_FreeBSD_11=	inherited from dependency devel/elfutils
>-
> BUILD_DEPENDS=	gnulib>=0:devel/gnulib
> LIB_DEPENDS=	libargp.so:devel/argp-standalone \
> 		libdw.so:devel/elfutils
>-- 
>2.30.0
>

Actions: View | Diff

Attachments on bug 252998: 221905