From nobody Wed Aug 28 06:02:06 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 4Wtv270Bkbz5Mv69; Wed, 28 Aug 2024 06:02:07 +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 4Wtv264pRTz4Yxj; Wed, 28 Aug 2024 06:02:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724824926; 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=5FHMBb1xN1BhE4BiD8gYX9+SFRsC8R/DyF9C6XGBIPM=; b=q6HdtJLjfJ6c6thoCvZ3NjoL9iVl5sbclYuY+FDmwixwO9Efadi92+Fmha1Hv7y+8exSpd ZG0h/UDhIMNPSxIlIFjW7ODw/UoELMJQ/MZNOERZ9Wzj9YihMHxkFRlz9CAiJZYf6hg19N BNdVHU1vzp37zLRHuXXMkRtXk4koFcN5o6PZ7TGI9aMDQdkm3TIlbQTGaD/2s9E73+NEn0 58i/RSoNm4DxA/WpARmiqYpl/v4qujQ4xGYZU2XgErmUEUt5GZL3j26FjaJGuIvlN1eU4U L5QKuF9Uo6oS5lFo4d+aikuCple02IgBUpJS1sT7NIX6xBwSnjnsH6DyxGiIWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724824926; a=rsa-sha256; cv=none; b=cyxx4+UxZhMyZgyE8SG2cIcvFqPUE8XGSjc+S0xhMO/Sjg2LqBTNysO4KGtOsMite+2KAJ qcZZRGS8kK9ql9EPDLpDj1+Yx8IEYrXWtD+uNvudb8eTDz6FCSehPF43ftp3gwZArlZmFG kDiew8EPvIgD2Vj1HCqemTyuGkc6pYmkmBabtSvVbU3lqu9N8QpXlesnqSLSGjKZYogQBE kocW6kD9sOlmGsMOB1lOWi+W7COcqXFS6aAE1Fu4Vvvww5Tf3vgLKU1VACWdEIomQu4tz7 VpWQKOeTCjq0Vasggg3RK4p7A4YFyX3Im7/GVenTSrtXg1O14bRIpNnOeyXGMA== 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=1724824926; 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=5FHMBb1xN1BhE4BiD8gYX9+SFRsC8R/DyF9C6XGBIPM=; b=NxUeklW0puuz8dNB4tbD03zwqiGkiocPN9qq2ryEesqPd5zo0BDPCIiqFbC1ZEf45Ye+26 3yNEtKtidUZGNJlTJXcRFIgf7vk0Ok9RC7/E7aMY85QPUU7JgSg1uOul8ZjOehGTAt9wVq eRtIw/LgOko1sFU0x97ViihcwhdHM0yTeGrgymAMnvw8btvSzkQmPYypYOrGiEnMbNawve y7IaHnVesKDZDBS+d0lFSDjXZEHVAYfx2/S7v0raJKsib3xkFb+txwj+VWsOTDwpxnZxi+ HMSplhVEgnvcliSFED56zgx7zxZ5693F0B4LRU1ulDxp/3E/33TTum/Sul0GCw== 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 4Wtv264PSyzMBp; Wed, 28 Aug 2024 06:02: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 47S626Hf013813; Wed, 28 Aug 2024 06:02:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47S6260F013810; Wed, 28 Aug 2024 06:02:06 GMT (envelope-from git) Date: Wed, 28 Aug 2024 06:02:06 GMT Message-Id: <202408280602.47S6260F013810@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: d31fb9678d73 - main - devel/binutils: Pet portclippy 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: d31fb9678d7312593a49348e94d5d4bce3b2f0a7 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=d31fb9678d7312593a49348e94d5d4bce3b2f0a7 commit d31fb9678d7312593a49348e94d5d4bce3b2f0a7 Author: Cy Schubert AuthorDate: 2024-08-26 15:29:12 +0000 Commit: Cy Schubert CommitDate: 2024-08-28 06:00:20 +0000 devel/binutils: Pet portclippy In addition to petting portclippy, replace the "rm" command with its predefined variable. PR: 281070 MFH: 2024Q3 --- devel/binutils/Makefile | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/devel/binutils/Makefile b/devel/binutils/Makefile index 366797b8a361..14c05bec499d 100644 --- a/devel/binutils/Makefile +++ b/devel/binutils/Makefile @@ -26,8 +26,8 @@ FLAVORS= native aarch64 aarch64_none_elf amd64 arm_gnueabi arm_none_eabi \ FLAVOR?= native USES= bison:alias compiler:env cpe gmake localbase libtool perl5 pkgconfig tar:lz -USE_PERL5= build CPE_VENDOR= gnu +USE_PERL5= build GNU_CONFIGURE= yes GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share @@ -53,15 +53,16 @@ CONFLICTS= libbfd OPTIONS_DEFINE= INFO NLS RELRO OPTIONS_DEFAULT= INFO +OPTIONS_EXCLUDE= NLS OPTIONS_SUB= yes -RELRO_DESC= Enable relocation memory corruption mitigation (-z relro) by default -RELRO_CONFIGURE_ON= --enable-relro -RELRO_CONFIGURE_OFF= --enable-relro=no -NLS_USES= gettext -NLS_CONFIGURE_ENABLE= nls INFO_EXTRA_PATCHES_OFF= ${PATCHDIR}/extra-patch-no-info INFO_USES= makeinfo +NLS_USES= gettext +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 aarch64_COMMENT= GNU binutils for ${FLAVOR} development @@ -75,7 +76,6 @@ BUTARGET?= ${PKGNAMEPREFIX}${OPSYS:tl}${OSREL} BUTARGET?= ${PKGNAMEPREFIX}unknown-${OPSYS:tl}${OSREL} .endif PLIST_SUB= BUTARGET=${BUTARGET} -OPTIONS_EXCLUDE= NLS INFO_PATH= ${PKGNAMEPREFIX:S/-$//}/share/info .if ${FLAVOR} == aarch64 @@ -102,7 +102,6 @@ CONFIGURE_ARGS+= --disable-shared PLIST_SUB+= SHARED='@comment' .endif - .if ${FLAVOR} == native BUREMOVE= coffdump \ dlltool \ @@ -174,7 +173,7 @@ post-install: ${RM} -r ${STAGEDIR}${PREFIX}/${PKGNAMEPREFIX:S/-$//} .endif ${RM} ${STAGEDIR}${PREFIX}/${BUTARGET}/lib/ldscripts/i386bsd.* - @if [ -d ${STAGEDIR}${PREFIX}/${INFO_PATH:H} ] ; then rm -rf ${STAGEDIR}${PREFIX}/${INFO_PATH:H}; fi + @if [ -d ${STAGEDIR}${PREFIX}/${INFO_PATH:H} ] ; then ${RM} -rf ${STAGEDIR}${PREFIX}/${INFO_PATH:H}; fi ${LN} -fs ../../bin/${BUTARGET}-size ${STAGEDIR}${PREFIX}/${BUTARGET}/bin/size ${RM} -r ${STAGEDIR}${PREFIX}/lib/bfd-plugins .endif