Attachment 247253 Details for Bug 273479 – patch

[patch] patch

4801d44494.patch (text/plain), 1.15 KB, created by Ivan Rozhuk on 2023-12-26 03:28:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ivan Rozhuk

Created: 2023-12-26 03:28:17 UTC

Size: 1.15 KB

patch

obsolete

>From 4801d444940b4f1e207e2b03dcf7c4e6b7e96205 Mon Sep 17 00:00:00 2001
>From: Rozhuk Ivan <rozhuk.im@gmail.com>
>Date: Tue, 26 Dec 2023 05:17:43 +0200
>Subject: [PATCH] devel/glib20: disable libelf from ports
>
>---
> devel/glib20/Makefile | 7 +++++++
> 1 file changed, 7 insertions(+)
>
>diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
>index 6e92ba34877e..70ecf7991ed1 100644
>--- a/devel/glib20/Makefile
>+++ b/devel/glib20/Makefile
>@@ -29,6 +29,7 @@ MESON_ARGS=	-Db_lundef=false \
> 		-Dlocalstatedir=/var \
> 		-Druntime_dir=/var/run \
> 		-Dselinux=disabled \
>+		-Dlibelf=disabled \
> 		-Dxattr=false
> BINARY_ALIAS=	python3=${PYTHON_CMD}
> PORTSCOUT=	limitw:1,even
>@@ -98,6 +99,12 @@ post-patch:
> 		${WRKSRC}/gio/xdgmime/xdgmime.c \
> 		${WRKSRC}/glib/gutils.c \
> 		${WRKSRC}/glib/tests/utils.c
>+	# 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}/gio/gresource-tool.c
> 
> CODEGENDIR=	${PREFIX}/share/glib-2.0/codegen
>

Flags:

rozhuk.im: maintainer-approval?

Actions: View | Diff

Attachments on bug 273479: 247253