Attachment 247955 Details for Bug 275443 – patch

[patch] patch

181821ac9d.patch (text/plain), 2.37 KB, created by Ivan Rozhuk on 2024-01-25 17:03:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ivan Rozhuk

Created: 2024-01-25 17:03:44 UTC

Size: 2.37 KB

patch

obsolete

>From 181821ac9d6b4473d2b8e9947759dea1934f9b02 Mon Sep 17 00:00:00 2001
>From: Rozhuk Ivan <rozhuk.im@gmail.com>
>Date: Fri, 15 Sep 2023 23:52:18 +0300
>Subject: [PATCH] graphics/mesa-dri: disable some optional deps not linked in
> ports Makefile; force use libelf from system
>
>---
> graphics/mesa-dri/Makefile.common  |  9 ---------
> graphics/mesa-dri/Makefile.targets | 15 +++++++++++++++
> 2 files changed, 15 insertions(+), 9 deletions(-)
>
>diff --git a/graphics/mesa-dri/Makefile.common b/graphics/mesa-dri/Makefile.common
>index 19231e2c2156..5d54d996645d 100644
>--- a/graphics/mesa-dri/Makefile.common
>+++ b/graphics/mesa-dri/Makefile.common
>@@ -82,15 +82,6 @@ BINARY_ALIAS+=	python3=${PYTHON_VERSION}
> 
> CONFIGURE_ENV+=	LLVM_CONFIG=${LLVM_CONFIG}
> 
>-# Deal with unclean env if the user have elfutils installed
>-# and build the port directly without poudriere
>-.if exists(${LOCALBASE}/include/libelf.h)
>-LIB_DEPENDS+=	libelf.so:devel/elfutils
>-MESON_ARGS+=	-Dlibelf=enabled
>-.else
>-MESON_ARGS+=	-Dlibelf=disabled
>-.endif
>-
> # Some symbols in mesa's linker version scripts are not always defined,
> # depending on configuration options. Suppress errors with lld >= 17 due to
> # these undefined symbols.
>diff --git a/graphics/mesa-dri/Makefile.targets b/graphics/mesa-dri/Makefile.targets
>index b7e891579ab7..8161fcc07092 100644
>--- a/graphics/mesa-dri/Makefile.targets
>+++ b/graphics/mesa-dri/Makefile.targets
>@@ -1,6 +1,21 @@
> # this file holds common targets
> 
> post-patch:
>+	# Disable some autostaff.
>+	@${REINPLACE_CMD} -e 's|dep_elf = dependency.*|dep_elf = null_dep|g' \
>+		-e 's|dep_libudev =.*|dep_libudev = null_dep|g' \
>+		-e 's|dep_openmp =.*|dep_openmp = null_dep|g' \
>+		-e 's|dep_xcb_keysyms =.*|dep_xcb_keysyms = null_dep|g' \
>+		${WRKSRC}/meson.build
>+	# Force use libelf headers from base.
>+	# gelf.h includes <libelf.h> so remove it to avoid conflict between
>+	# </usr/include/libelf.h> and <libelf.h>=/usr/local/include/libelf.h.
>+	${REINPLACE_CMD} -e 's|#include <gelf.h>||g' \
>+		-e 's|#include <libelf.h>|#include </usr/include/libelf.h>|g' \
>+		${WRKSRC}/src/amd/common/ac_rtld.c \
>+		${WRKSRC}/src/amd/common/ac_rgp_elf_object_pack.c \
>+		${WRKSRC}/src/gallium/drivers/r600/evergreen_compute.c \
>+		${WRKSRC}/src/gallium/frontends/clover/llvm/codegen/native.cpp
> 	${REINPLACE_CMD} -e '/SYSCONFDIR/ s|/etc|${PREFIX}/etc|g' \
> 		-e '/DATADIR/ s|/usr/share|${PREFIX}/share|g' \
> 		${WRKSRC}/src/util/xmlconfig.c

Flags:

rozhuk.im: maintainer-approval?

Actions: View | Diff

Attachments on bug 275443: 246680 | 247955