Attachment 239949 Details for Bug 268994 – Two commits: Update to 2.40, add zstd support, depend on zstd port

[patch] Two commits: Update to 2.40, add zstd support, depend on zstd port

pr268994.diff (text/plain), 5.54 KB, created by Cy Schubert on 2023-02-06 15:27:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Cy Schubert

Created: 2023-02-06 15:27:44 UTC

Size: 5.54 KB

patch

obsolete

>From fac94cdd1ae344214b8eae044442bee24e5dac05 Mon Sep 17 00:00:00 2001
>From: Cy Schubert <cy@FreeBSD.org>
>Date: Sun, 15 Jan 2023 08:43:12 -0800
>Subject: [PATCH 1/2] devel/binutils: Update from 2.39 to 2.40
>
>Update our binutils port from 2.39 to 2.40.
>
>Exp-run PR:     268994
>Exp-run by:
>---
> devel/binutils/Makefile                            |  5 +++--
> devel/binutils/distinfo                            |  6 +++---
> .../files/patch-gold_testsuite_Makefile.in         | 14 --------------
> devel/binutils/pkg-plist                           |  4 ++++
> 4 files changed, 10 insertions(+), 19 deletions(-)
> delete mode 100644 devel/binutils/files/patch-gold_testsuite_Makefile.in
>
>diff --git a/devel/binutils/Makefile b/devel/binutils/Makefile
>index a7db40351340..1a3be70c116a 100644
>--- a/devel/binutils/Makefile
>+++ b/devel/binutils/Makefile
>@@ -1,5 +1,5 @@
> PORTNAME=	binutils
>-PORTVERSION=	2.39
>+PORTVERSION=	2.40
> PORTEPOCH?=	1
> CATEGORIES?=	devel
> MASTER_SITES=	SOURCEWARE/binutils/releases
>@@ -102,7 +102,8 @@ INFO=		as \
> 		ctf-spec \
> 		gprof \
> 		bfd \
>-		ld
>+		ld \
>+		sframe-spec
> .endif
> 
> .include <bsd.port.pre.mk>
>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..0c355b208a09 100644
>--- a/devel/binutils/pkg-plist
>+++ b/devel/binutils/pkg-plist
>@@ -23,6 +23,8 @@ 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
>@@ -30,6 +32,7 @@ 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 +114,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
>-- 
>2.39.1
>
>
>From 6c1654cd97a80a3b1d61a1ae33b9c847eb6c6915 Mon Sep 17 00:00:00 2001
>From: Cy Schubert <cy@FreeBSD.org>
>Date: Tue, 17 Jan 2023 07:21:04 -0800
>Subject: [PATCH 2/2] devel/binutils: Enable zstd support
>
>Enable zstd support. Depend on  the port in case the port is newer
>than base.
>
>PR:		268994
>Reported by:	dizzy
>---
> devel/binutils/Makefile | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
>diff --git a/devel/binutils/Makefile b/devel/binutils/Makefile
>index 1a3be70c116a..0eebe9e8a707 100644
>--- a/devel/binutils/Makefile
>+++ b/devel/binutils/Makefile
>@@ -1,5 +1,6 @@
> PORTNAME=	binutils
> PORTVERSION=	2.40
>+PORTREVISION=	1
> PORTEPOCH?=	1
> CATEGORIES?=	devel
> MASTER_SITES=	SOURCEWARE/binutils/releases
>@@ -16,6 +17,8 @@ LICENSE_FILE_LGPL3=	${WRKSRC}/COPYING3.LIB
> BUILD_DEPENDS=	${LOCALBASE}/lib/libgmp.so:math/gmp \
> 		${LOCALBASE}/lib/libmpfr.so:math/mpfr
> 
>+DEPENDS=	${LOCALBASE}/lib/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
>@@ -30,7 +33,8 @@ GNU_CONFIGURE=	yes
> CONFIGURE_ARGS+=	--disable-werror \
> 			--enable-deterministic-archives \
> 			--with-sysroot=/ \
>-			--enable-x86-relax-relocations=no
>+			--enable-x86-relax-relocations=no \
>+			--with-zstd
> MAKE_ARGS+=	LIBDL=""
> MAKE_ENV+=	ac_cv_func_sbrk=0
> TEST_TARGET=	check
>-- 
>2.39.1
>

Actions: View | Diff

Attachments on bug 268994: 239518 | 239535 | 239949 | 240151 | 240331