From nobody Fri Feb 24 15:04:20 2023 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 4PNY842Wyxz3tbG4; Fri, 24 Feb 2023 15:04:20 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PNY8420rzz4H4g; Fri, 24 Feb 2023 15:04:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677251060; 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=k522DWsS2YhSVOOQdsw00805it/gUGidauCX7tHtTCo=; b=I5x3UdL+UrwQKTmtCQzTWB752xagPnCN1v7xulhZ1Ig9EHjHTbtODmPELDVUQOqACYbymJ 8uOEGeF4jRGsISleMYtCgc0vIdxGI/uV3JDnhtx/FJgkeAHyxTG6aLQUanG8v99TnHy9Kx LsEhxh4bSmfRs3opLOY5snkHmrEuOF/pz3lfGrIX76MxPavHs+E///wB8khDYpZyauivm5 OAnZrYmBMJEYvlbwrA1B6akDGtA1WwsV0oDnkp0d6N3p76UCxeyyJ7GYeQ/G6mHPSFCWfi bg9w7Aei3M/bk1BEiDL2qcrzWT+GVazegoQEgo9WKEYuJGHVH+jPNZMHAOdkZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677251060; 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=k522DWsS2YhSVOOQdsw00805it/gUGidauCX7tHtTCo=; b=m3B6j8vgWLDjFFfKkJOh5VNqTxJ8PooQ+ABpyOQsP+P3XFxQkC9ueo59HYiIwNxShkCJNk SKAFYjXfIHpCxDtxW7ivY02vb+796NoPK56ZJquJbBZL1Ow0t3m/WRyzfNo0ODjVuZVlzW ocPywHhq+aDjigaWuiLzVqh8PitU7c8eWg93p5/KWkZiLmOFw2rkriwKdkjNhZhJRrsR8E Durv8c3+miZgfLAKpfy75gt/a3CwR7ud9ywSzqpEAdmbooP+SrHX+5Tw55MsFAXtkcLbA8 wHUbYjf0mlZddnNsr+77TBPduCHrXoH4PALAx6CEzwkp+83kGwYMPBeU8CeTOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677251060; a=rsa-sha256; cv=none; b=bkvzbvcCort4P4/YQIp6xo/14EXEO3MU6jPYswcEWctK0ECaj7PkFa4I4BNAy3BNOZ+BpW 8coYNL7NxImZtbghiDDm0GozljkPXhhIxvjU5QCrSVDvAf+ky/Xd6IWNQnokr/nCwu3yt8 F8EUnQUKMdhu10w1q4CbNSNmh2XnY7YFScZDfP1GbFEaF1yjLcJtwRrbU70uCgSn93gbJV R2FMrK4HMEcp8pkHoKcwInekk3yv0jF3FS1xLuJoiAI8FwYj6Tg+J5p7KlXJh2eGyxZ3hg 5crt/FvhhLhQ7rFu9veGMVaTf3liySH+e/H+SMf7z8QZi1AiF6GYP7KCL4vwXg== 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 4PNY8414YMzST5; Fri, 24 Feb 2023 15:04:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31OF4KcX092579; Fri, 24 Feb 2023 15:04:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31OF4Ktm092578; Fri, 24 Feb 2023 15:04:20 GMT (envelope-from git) Date: Fri, 24 Feb 2023 15:04:20 GMT Message-Id: <202302241504.31OF4Ktm092578@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: 5012011fb0bf - main - devel/binutils: Update from 2.39 to 2.40 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 5012011fb0bfe69838c6526ece932e9225b7b5b4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=5012011fb0bfe69838c6526ece932e9225b7b5b4 commit 5012011fb0bfe69838c6526ece932e9225b7b5b4 Author: Cy Schubert AuthorDate: 2023-02-14 15:30:25 +0000 Commit: Cy Schubert CommitDate: 2023-02-24 15:00:43 +0000 devel/binutils: Update from 2.39 to 2.40 Update our binutils port from 2.39 to 2.40. Enable zstd support. Depend on the port in case the port is newer than base. Additional contributions by dizzy@: - Use DISTVERSION instead of PORTVERSION - Drop (reset) PORTREVISION - Define zstd as LIB_DEPENDS rather than DEPENDS - Add USES= localbase pkgconfig to fix (lib)zstd detection - Set zstd as default compression algorithm for compressed debug sections - Enable verbose output during build - Drop STATIC option, it's unsupported upstream and fails to build Also, disable tests because --compress-debug-sections is always set to zlib-gabi regardless of the compression setting by ./configure, resulting in failure. Exp-run PR: 268994 Exp-run by: antoine --- devel/binutils/Makefile | 24 ++++++++++++++-------- devel/binutils/distinfo | 6 +++--- .../files/patch-gold_testsuite_Makefile.in | 14 ------------- devel/binutils/pkg-plist | 7 +++++-- 4 files changed, 23 insertions(+), 28 deletions(-) diff --git a/devel/binutils/Makefile b/devel/binutils/Makefile index a7db40351340..2e773537d046 100644 --- a/devel/binutils/Makefile +++ b/devel/binutils/Makefile @@ -1,5 +1,5 @@ PORTNAME= binutils -PORTVERSION= 2.39 +DISTVERSION= 2.40 PORTEPOCH?= 1 CATEGORIES?= devel MASTER_SITES= SOURCEWARE/binutils/releases @@ -16,12 +16,14 @@ LICENSE_FILE_LGPL3= ${WRKSRC}/COPYING3.LIB BUILD_DEPENDS= ${LOCALBASE}/lib/libgmp.so:math/gmp \ ${LOCALBASE}/lib/libmpfr.so:math/mpfr +LIB_DEPENDS= libzstd.so:archivers/zstd + FLAVORS= native aarch64 aarch64_none_elf amd64 arm_gnueabi arm_none_eabi \ avr i386 mingw32 mips mips64 powerpc powerpc64 powerpc64le riscv64 \ riscv64_none_elf s390x sparc64 riscv32_unknown_elf FLAVOR?= native -USES= bison:alias compiler:env cpe gmake libtool makeinfo perl5 tar:lz +USES= bison:alias compiler:env cpe gmake localbase libtool makeinfo perl5 pkgconfig tar:lz USE_PERL5= build CPE_VENDOR= gnu GNU_CONFIGURE= yes @@ -30,21 +32,24 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --disable-werror \ --enable-deterministic-archives \ --with-sysroot=/ \ - --enable-x86-relax-relocations=no -MAKE_ARGS+= LIBDL="" + --enable-x86-relax-relocations=no \ + --with-zstd \ + --enable-default-compressed-debug-sections-algorithm=zstd +MAKE_ARGS+= LIBDL="" V=1 MAKE_ENV+= ac_cv_func_sbrk=0 -TEST_TARGET= check + +# Tests will always fail because --compress-debug-sections is always set to +# zlib-gabi regardless of the compression setting by ./configure. +# TEST_TARGET= check CONFLICTS= libbfd -OPTIONS_DEFINE= NLS RELRO STATIC +OPTIONS_DEFINE= NLS RELRO OPTIONS_SUB= yes -STATIC_PREVENTS= NLS RELRO_DESC= Enable relocation memory corruption mitigation (-z relro) by default RELRO_CONFIGURE_ON= --enable-relro RELRO_CONFIGURE_OFF= --enable-relro=no -STATIC_LDFLAGS+= -all-static NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls @@ -102,7 +107,8 @@ INFO= as \ ctf-spec \ gprof \ bfd \ - ld + ld \ + sframe-spec .endif .include diff --git a/devel/binutils/distinfo b/devel/binutils/distinfo index 29906643c282..14280232a4b2 100644 --- a/devel/binutils/distinfo +++ b/devel/binutils/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1660760045 -SHA256 (binutils-2.39.tar.lz) = 5ab51668874d8533201b8edd2edb5e5d81d588205c6da300c8919bd7cf8664e8 -SIZE (binutils-2.39.tar.lz) = 24759528 +TIMESTAMP = 1673799644 +SHA256 (binutils-2.40.tar.lz) = 48e65ecee1bbcf334d7efb4ea8487fe048dea522e5da3bdf7fa42b1ec779ea33 +SIZE (binutils-2.40.tar.lz) = 24784952 diff --git a/devel/binutils/files/patch-gold_testsuite_Makefile.in b/devel/binutils/files/patch-gold_testsuite_Makefile.in deleted file mode 100644 index 2f8a15371a24..000000000000 --- a/devel/binutils/files/patch-gold_testsuite_Makefile.in +++ /dev/null @@ -1,14 +0,0 @@ ---- gold/testsuite/Makefile.in.orig 2021-07-02 07:48:07 UTC -+++ gold/testsuite/Makefile.in -@@ -9585,9 +9585,9 @@ uninstall-am: - @DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ cp -f incr_comdat_test_2_v3.o incr_comdat_test_1_tmp.o - @DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(CXXLINK) -Wl,--incremental-update -Wl,-z,norelro,-no-pie incr_comdat_test_1.o incr_comdat_test_1_tmp.o - @DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@exception_x86_64_bnd_1.o: exception_test_1.cc gcctestdir/as --@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(CXXCOMPILE) -c -fpic -Wa,-madd-bnd-prefix -o $@ $< -+@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(CXXCOMPILE) -c -fpic -o $@ $< - @DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@exception_x86_64_bnd_2.o: exception_test_2.cc gcctestdir/as --@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(CXXCOMPILE) -c -Wa,-madd-bnd-prefix -o $@ $< -+@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(CXXCOMPILE) -c -o $@ $< - @DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@gnu_property_test.stdout: gnu_property_test - @DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(TEST_READELF) -lhSWn $< >$@ - @DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@gnu_property_test: gcctestdir/ld gnu_property_a.o gnu_property_b.o gnu_property_c.o diff --git a/devel/binutils/pkg-plist b/devel/binutils/pkg-plist index 71a7c06f83ac..aa64c3d08214 100644 --- a/devel/binutils/pkg-plist +++ b/devel/binutils/pkg-plist @@ -23,13 +23,15 @@ include/ctf.h include/diagnostics.h include/dis-asm.h %%GOLD%%include/plugin-api.h +include/sframe-api.h +include/sframe.h include/symcat.h -%%STATIC%%lib/bfd-plugins/libdep.a -%%NO_STATIC%%lib/bfd-plugins/libdep.so +lib/bfd-plugins/libdep.so lib/libbfd.a lib/libctf-nobfd.a lib/libctf.a lib/libopcodes.a +lib/libsframe.a man/man1/addr2line.1.gz man/man1/ar.1.gz man/man1/as.1.gz @@ -111,6 +113,7 @@ man/man1/strip.1.gz %%NLS%%share/locale/pt_BR/LC_MESSAGES/opcodes.mo %%NLS%%share/locale/ro/LC_MESSAGES/bfd.mo %%NLS%%share/locale/ro/LC_MESSAGES/binutils.mo +%%NLS%%share/locale/ro/LC_MESSAGES/gold.mo %%NLS%%share/locale/ro/LC_MESSAGES/gprof.mo %%NLS%%share/locale/ro/LC_MESSAGES/opcodes.mo %%NLS%%share/locale/ru/LC_MESSAGES/bfd.mo