From nobody Thu Aug 29 15:06:00 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 4Wvl3F0pGcz5PbDr; Thu, 29 Aug 2024 15:06:01 +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 4Wvl3D62Q7z4nh1; Thu, 29 Aug 2024 15:06:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724943960; 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=qwCZ2d1B9XXxXJ1hG3PC3QBkx0W9yUu4MDj2gMrroW4=; b=yhcJbB7sHePA+QEOkV6xFs2RsfIEbZBtlOMozsMrUZFlDfqIjglImPrMTO7gvbA+A+3tmY jZAYjPgGwtHnrEz7quQnUppA8WVt6PYIuT7OuR5zAoUSyFARRs1354UrzvfIpdskexkvjt XbKXedcj1mUdLOkiE9eYKhr0Dt3Hf21c28Aerv6/fJrrrYSkh/mgb6qG4Y8S6HdkWmWss9 s+nSkVlPivdLqFQZNOwIibjrJQS7kqliHTa6SuKHmcUFH12Bt0Dwx2vG1s6LvULGj3JBiV 6MPUH4bb3DQeZ7Q4952RZthSslfP4WJkge7ApZPHLNYbc3iQvd+K2sZO686Z0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724943960; a=rsa-sha256; cv=none; b=eMnyTp5ZmwKgzVwg3JTMQx8c9UO+SAi1On9XjYjGxO6GLP2DhFWbdCK4OxQmLfiQA2kyUK UkLDpQBa/Vjcc1pfVtuXy7TdaVHWgbXFU4Zyvj7qHpX1NlTRwa5jQZHKzKZqXpFkxM+gH1 8+LdReQx8cUHspN8IejauGV79EXPI+C2ljtGFA5ZQ1N+O8RcfaC4DRVt16ekCCvKyYiTo2 k22DWT/KD39sSMcGI5jk/ecWYeN/qsHG375PQLfwCPbIsxR90+63sze5GDfvsLVkQwZvGE +c9WtAWwAwlP05Yp2QzQ+UWlK40vZcsRViGws+MMgFUV8aHUMTNM8IdRw8uYsg== 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=1724943960; 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=qwCZ2d1B9XXxXJ1hG3PC3QBkx0W9yUu4MDj2gMrroW4=; b=U2PEkDd4aYNOrLu+FucmZlXA0v5roRKYuoHdgWDhqE8sVXGLvBtyZt02ttqyTgxx6CSMtQ YmBp4e1CpiUFhIU/ep6+0M1TEb0EjXJu0KB8hYrynbX88tqRv7xjWpUBgwizF7EBSs5Er0 DuOA3RLduvLu3GbebG3SCaqN8doms7xel/i0g/RYJ3IDSk7Jqkr3RC4VAnUNwvyd6cZG75 wl4p/iHH1+kIlqYVPJq5FAke2XgHn960c7EURB52JVBScAcM0hpy5AJvSleJ/UMp6xCBe5 a9nmKGna6VIgOjr6XzWmh8FNO6wO3aoaps7F/A1rPT7rC3Sp0GRab46GTQgSnQ== 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 4Wvl3D5d8yzMZR; Thu, 29 Aug 2024 15:06:00 +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 47TF60nC078833; Thu, 29 Aug 2024 15:06:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47TF60xU078830; Thu, 29 Aug 2024 15:06:00 GMT (envelope-from git) Date: Thu, 29 Aug 2024 15:06:00 GMT Message-Id: <202408291506.47TF60xU078830@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: 5e33d1709369 - main - devel/binutils: Remove autodependency on devel/elfutils 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: 5e33d1709369d21c966c8ac57443a5af99c8b8fa Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=5e33d1709369d21c966c8ac57443a5af99c8b8fa commit 5e33d1709369d21c966c8ac57443a5af99c8b8fa Author: Cy Schubert AuthorDate: 2024-08-29 15:01:27 +0000 Commit: Cy Schubert CommitDate: 2024-08-29 15:05:48 +0000 devel/binutils: Remove autodependency on devel/elfutils Users who manually pre-install devel/elfutils and subsequently manually build and install binutils must now enable the dependency. The previous commit provided the option but also didn't change the implied (autodetect) behavior. This change now disables elfutils autodetection. Users must now explicitly enable the option if they were previously relying on autodetection. Requested by: mat, jrm --- UPDATING | 14 ++++++++++++++ devel/binutils/Makefile | 21 ++++++--------------- 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/UPDATING b/UPDATING index 7f2a8ff47376..3ead1b7de0ed 100644 --- a/UPDATING +++ b/UPDATING @@ -5,6 +5,20 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20240829: + AFFECTS: devel/binutils + AUTHOR: cy@FreeBSD.org + + Historically devel/binutils would implicitly use devel/elfutils when + it discovers it previously installed. This resulted in it depending on, + though not explicitly if previously found, elfutils when built manually. + This behvior has now changed. binutils will now disable any + auto-dependency on elfutils. Users who build binutils manually and wish + to have it depend on elfutls must now explicitly set the option when + building binutils. + + There is no change to packages built by poudriere. + 20240824: AFFECTS: dns/acme-dns AUTHOR: netchild@FreeBSD.org diff --git a/devel/binutils/Makefile b/devel/binutils/Makefile index 059ccaa36a8e..d8fa657f2689 100644 --- a/devel/binutils/Makefile +++ b/devel/binutils/Makefile @@ -1,6 +1,6 @@ PORTNAME= binutils DISTVERSION= 2.40 -PORTREVISION= 7 +PORTREVISION= 8 PORTEPOCH?= 1 CATEGORIES?= devel MASTER_SITES= GNU \ @@ -49,11 +49,9 @@ LDFLAGS+= -Wl,--undefined-version CONFLICTS= libbfd -OPTIONS_DEFINE= INFO NLS RELRO -OPTIONS_DEFAULT= ELFU_AUTO INFO +OPTIONS_DEFINE= ELFU INFO NLS RELRO +OPTIONS_DEFAULT= 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 @@ -64,11 +62,9 @@ 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 +ELFU_DESC= Depend on devel/elfutils +ELFU_CONFIGURE_WITH= debuginfod +ELFU_LIB_DEPENDS= libdebuginfod.so:devel/elfutils aarch64_COMMENT= GNU binutils for ${FLAVOR} development @@ -136,11 +132,6 @@ 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