From nobody Wed Aug 28 16:03:05 2024 X-Original-To: dev-commits-ports-main@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 4Wv8MZ1VTkz52W6c; Wed, 28 Aug 2024 16:03:06 +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 4Wv8MZ0lnSz4Xk9; Wed, 28 Aug 2024 16:03:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724860986; 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=riIEu/Tj8z94xaccNC0btZqreSzgeXjxgFoJQFM9t4Q=; b=Epzu6HvBIv4j/wZRhinYghFg650lqXkYdk/Fz1BgqJ5hTZwa8zyggbH/TTsbd4C+oALKWt pPVO7xb/7ON3k1hmqK+/Hgb10NH2oVxchWwOWxsv4aAbSl718puwYpTvNFYjTXUYYOz5og oltmLNcKk5d95TxCnJ/nK6+TxdX7bqVZqa8tUWJbOC1CSemfHleIG2/ymRFI2FKmEhrQ1u dGWjfmm9iWd5mCMXeuPAtiDBl1NvWSMjKUnLLgK9Fz9zhAGxr6kb3caCggJ0vQZlBPaPAc CMH3umCWMGiZ3VrTSLY1+326ZYLvoYRjSRGwHxVZeUC8dBa+/RlmABKm/sSh3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724860986; a=rsa-sha256; cv=none; b=womswhnJtX2nHKRP0mTG1nKcRoBY6ZllOqPy22X6JrAm2scf0Q5s386vuvSKlSQnBdmioj QyfvxtwZ28OfQeC0bkNwAdxoOJX4b4qvWqcplckvhsLuJ4XdN8s1a2h15fN5BhzmD15IHm E/sQ7enrEagkHV/I/OTDDKMVchgWVoafZ4lySnqwnIf2JEcX5bTbuLXcIxJ5tTd1FHOaKI B04quGhvcRiwBjbPzRCR/3/D06B5F67U8EQgOFriYuMTnjZJuqkgo9cw5HvCiUt7Q93y2z HX6YwzmJucRe3CtmWaxs6VyneKPNURrSjoPyBpH2ZPaiOeMvS0xyJDS6pPEC3g== 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=1724860986; 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=riIEu/Tj8z94xaccNC0btZqreSzgeXjxgFoJQFM9t4Q=; b=i24s9+nT4YO4D/Hiv62L8EiwaODRg0OGF05VpOVRplY6dDX65xfHAtC9vXj4pTqsAxRfJp +D8rbRjYPmbj5USiyMesiiaiLpMxSPkYUnF+LQ4S9o1x1YtUij9RdckMwKKNnjYLqx8aV4 QmiKs14JR4679M7Jx6rb494y4l1wYKrULPPvdS0aCYGIDAUIL85ZXO0usiscKpArOB8/pt jLWfkhX+IopeLHeU6Rnjz8xUQnSlvHbq9kfRb31qEQDw1vAoOruY8oaOKpGvx+myU6Ptfe PD69an/pOLXUd9wB85C9oJBjQ6mnTLQ3tWr/gfBnvVHNRunuWpsiohheM193Rw== 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 4Wv8MZ0M6xzg3l; Wed, 28 Aug 2024 16:03:06 +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 47SG35Fc035608; Wed, 28 Aug 2024 16:03:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47SG35Q9035605; Wed, 28 Aug 2024 16:03:05 GMT (envelope-from git) Date: Wed, 28 Aug 2024 16:03:05 GMT Message-Id: <202408281603.47SG35Q9035605@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: ccc21de09381 - main - devel/binutils: Add devel/elfutils dependency options List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ccc21de09381b5fc0e19980d69c0d1ee2bde84de Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=ccc21de09381b5fc0e19980d69c0d1ee2bde84de commit ccc21de09381b5fc0e19980d69c0d1ee2bde84de Author: Cy Schubert AuthorDate: 2023-09-17 01:40:57 +0000 Commit: Cy Schubert CommitDate: 2024-08-28 15:56:33 +0000 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 | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/devel/binutils/Makefile b/devel/binutils/Makefile index ea2124ab2344..059ccaa36a8e 100644 --- a/devel/binutils/Makefile +++ b/devel/binutils/Makefile @@ -50,8 +50,10 @@ LDFLAGS+= -Wl,--undefined-version CONFLICTS= libbfd OPTIONS_DEFINE= INFO NLS RELRO -OPTIONS_DEFAULT= INFO +OPTIONS_DEFAULT= ELFU_AUTO INFO OPTIONS_EXCLUDE= NLS +OPTIONS_RADIO= ELFUTILS_ENABLE +OPTIONS_RADIO_ELFUTILS_ENABLE= ELFU_AUTO ELFU_YES ELFU_NO OPTIONS_SUB= yes INFO_EXTRA_PATCHES_OFF= ${PATCHDIR}/extra-patch-no-info @@ -61,6 +63,12 @@ NLS_CONFIGURE_ENABLE= nls RELRO_CONFIGURE_ON= --enable-relro RELRO_CONFIGURE_OFF= --enable-relro=no RELRO_DESC= Enable relocation memory corruption mitigation (-z relro) by default +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 @@ -128,6 +136,11 @@ INFO_INFO= as \ .include +# 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} != 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