From nobody Thu Apr 24 08:46:12 2025 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZjqM91bkjz5tkZp; Thu, 24 Apr 2025 08:46:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZjqM90nvDz3xfQ; Thu, 24 Apr 2025 08:46:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745484373; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GU04SL8t+yB4XvGFdQTUoYTBsIppzIHMKPuu0BJk24g=; b=Lo/8bnErHYG0ITmdUu71FA7j/aEDhMjzmp6Pee8u+xZ8gOJB+pP3KuIzFH9wC6bRyGZuXj 5RbQ6HL9fj3xWvQBXENohjW4QV2IAA7pmGUaanumSCk2G9mqtuRQvSb5iQTB7EntzDCy8B dyAEp1Ntu9bOlb2A1/KVdfIMu33Uo6uk+WjBCeT75NOLVjDDmRAGg3m9ohhDnikiW8eyym fzDkTMyijXrVkl1at95vrFSBZ/lMftf/MP58Dfab5P6bG08z3VxvI2Os5BwtRaekRwqBjP KN1VeF5p7PvhAy5S+ZQ99HpQhkVG+gqkS3Max2oY1UlUBcjIFGVdLdw5m5miiw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745484373; a=rsa-sha256; cv=none; b=APSQnQJMwyn6A4gqp+GFjh21sJO/QCa+FONR9n39W+Jq9WBfVUfGxOXkf/3u3hsEPvBijU hdBFk251f6gk7E109x0wxNwK2GHjUsOiS3outihWDB0X2adicEkaupMbjTUiUw0sQZcMWP D1fZzKuLwvME30AqalHGN6qjk37tnBh2bLmHS5peH5J+NFvQ6oK4Ey4wD3Ag1qomLIkTN9 J0xWCYEix4+2mTddm7Nb4tvnfACTn1HNBbg67TRThtkbdXQiXicO7JjPkvbRao9a9YijLo 2mohJLBfC1rLc4JhjSosfejzCstGD6zlUn5YESNjHEsaPrqD8sbP+rBm8JrIDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745484373; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GU04SL8t+yB4XvGFdQTUoYTBsIppzIHMKPuu0BJk24g=; b=oNIFVYho0a7qPv5UAnKcT6+imx7044xmeRnR1kXtOOoLSEks6RMrePM3RtrvoM+sih+nmz AUe0aztp8mjpolQjhDKqsI+Y0EyCMvtgQq0gSn6xoUxRd3XjbCSg2XJqUdKLCDysVrTnXB TLhg9xHWhlvg+/ykE+p1gTmgUoNI5ojtWZNf7bY1s+6wWTITRY9GA3qkEsx+kKUC9yzZ9E Smbi5ocxG8J/6WnKd1Zn6khW6tvLghDpfdSCwAyNdadekaVHHYxhtEqom0Lr07Nn3poSAQ 4Dk7HA38ck5XA4p4ow9CeURuVIpbSUW+X7+fhJLbFi1plXIz3t4JIdixFolMbA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZjqM90N4Pzjwg; Thu, 24 Apr 2025 08:46:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53O8kCXQ020429; Thu, 24 Apr 2025 08:46:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53O8kC5e020426; Thu, 24 Apr 2025 08:46:12 GMT (envelope-from git) Date: Thu, 24 Apr 2025 08:46:12 GMT Message-Id: <202504240846.53O8kC5e020426@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: 8107e8e7cb0b - main - devel/glib20: Prevent the silent grabbing of libelf from ports List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8107e8e7cb0b549bdc4789a52e69015cd64b7b8d Auto-Submitted: auto-generated The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=8107e8e7cb0b549bdc4789a52e69015cd64b7b8d commit 8107e8e7cb0b549bdc4789a52e69015cd64b7b8d Author: Gleb Popov AuthorDate: 2025-04-24 08:12:15 +0000 Commit: Gleb Popov CommitDate: 2025-04-24 08:45:47 +0000 devel/glib20: Prevent the silent grabbing of libelf from ports PR: 273479 --- devel/glib20/Makefile | 3 ++- devel/glib20/files/patch-gio_gresource-tool.c | 15 +++++++++++++++ devel/glib20/files/patch-gio_meson.build | 11 +++++++++++ 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile index 170e4515ae0f..3ad20c2597cd 100644 --- a/devel/glib20/Makefile +++ b/devel/glib20/Makefile @@ -1,6 +1,6 @@ PORTNAME= glib DISTVERSION= 2.84.1 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 2 CATEGORIES= devel MASTER_SITES= GNOME @@ -42,6 +42,7 @@ MESON_ARGS= -Db_lundef=false \ -Ddefault_library=both \ -Dfile_monitor_backend='libinotify-kqueue' \ -Dinstalled_tests=false \ + -Dlibelf=disabled \ -Dlibmount=disabled \ -Druntime_dir=/var/run \ -Dselinux=disabled \ diff --git a/devel/glib20/files/patch-gio_gresource-tool.c b/devel/glib20/files/patch-gio_gresource-tool.c new file mode 100644 index 000000000000..1c58aa930ff4 --- /dev/null +++ b/devel/glib20/files/patch-gio_gresource-tool.c @@ -0,0 +1,15 @@ +--- gio/gresource-tool.c.orig 2025-04-03 14:38:51 UTC ++++ gio/gresource-tool.c +@@ -31,8 +31,10 @@ + #include + + #ifdef HAVE_LIBELF +-#include +-#include ++#include ++// fool libelf from ports to not include its libelf.h ++#define _LIBELF_H 1 ++#include + #endif + + #ifdef HAVE_MMAP diff --git a/devel/glib20/files/patch-gio_meson.build b/devel/glib20/files/patch-gio_meson.build new file mode 100644 index 000000000000..2a7e786fc478 --- /dev/null +++ b/devel/glib20/files/patch-gio_meson.build @@ -0,0 +1,11 @@ +--- gio/meson.build.orig 2025-04-03 14:38:51 UTC ++++ gio/meson.build +@@ -971,7 +971,7 @@ else + # This fallback is necessary on *BSD. elfutils isn't the only libelf + # implementation, and *BSD usually includes their own libelf as a system + # library which doesn't have a corresponding .pc file. +- libelf = cc.find_library('elf', required : get_option ('libelf')) ++ libelf = declare_dependency(link_args: '/lib/libelf.so.2') + have_libelf = libelf.found() + have_libelf = have_libelf and cc.has_function('elf_begin', dependencies : libelf) + have_libelf = have_libelf and cc.has_function('elf_getshdrstrndx', dependencies : libelf)