Attachment 236016 Details for Bug 265917 – Fixes a INFO plist issue and addresses breakage in PR/261875

[patch] Fixes a INFO plist issue and addresses breakage in PR/261875

0001-devel-binutils-Update-from-2.37-to-2.39.patch (text/plain), 5.24 KB, created by Cy Schubert on 2022-08-19 17:02:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Cy Schubert

Created: 2022-08-19 17:02:25 UTC

Size: 5.24 KB

patch

obsolete

>From 8f5e7d671f7598a9adb7cbbf8fa51dd8838c3b89 Mon Sep 17 00:00:00 2001
>From: Cy Schubert <cy@FreeBSD.org>
>Date: Wed, 17 Aug 2022 11:46:24 -0700
>Subject: [PATCH] devel/binutils: Update from 2.37 to 2.39
>
>Update our binutils port from 2.37 to 2.39. While at it change the distfile
>from tar.xz to tar.lz, which is 4 MB smaller than the .xz version.
>
>Exp-run PR:
>Exp-run by:
>---
> devel/binutils/Makefile                    |  8 ++--
> devel/binutils/distinfo                    |  6 +--
> devel/binutils/files/patch-etc_texi2pod.pl | 11 ------
> devel/binutils/files/patch-gold_gc.h       | 45 ----------------------
> devel/binutils/pkg-plist                   |  1 +
> 5 files changed, 9 insertions(+), 62 deletions(-)
> delete mode 100644 devel/binutils/files/patch-etc_texi2pod.pl
> delete mode 100644 devel/binutils/files/patch-gold_gc.h
>
>diff --git a/devel/binutils/Makefile b/devel/binutils/Makefile
>index cfbd408f2671..ffb027595996 100644
>--- a/devel/binutils/Makefile
>+++ b/devel/binutils/Makefile
>@@ -1,6 +1,5 @@
> PORTNAME=	binutils
>-PORTVERSION=	2.37
>-PORTREVISION=	4
>+PORTVERSION=	2.39
> PORTEPOCH?=	1
> CATEGORIES?=	devel
> MASTER_SITES=	SOURCEWARE/binutils/releases
>@@ -21,7 +20,7 @@ FLAVORS=	native aarch64 aarch64_none_elf amd64 arm_gnueabi arm_none_eabi \
> 		riscv64_none_elf s390x sparc64 riscv32_unknown_elf
> FLAVOR?=	native
> 
>-USES=		bison:alias compiler:env cpe gmake libtool makeinfo perl5 tar:xz
>+USES=		bison:alias compiler:env cpe gmake libtool makeinfo perl5 tar:lz
> USE_PERL5=	build
> CPE_VENDOR=	gnu
> GNU_CONFIGURE=	yes
>@@ -95,8 +94,11 @@ CONFIGURE_ARGS+=	--with-system-zlib \
> 			--with-mpfr=${LOCALBASE} \
> 			--enable-targets=all \
> 			--enable-threads=yes
>+# XXX Needed to support gcc10 and earlier:
>+CONFIGURE_ARGS+=	--with-isa-spec=2.2
> INFO=		as \
> 		binutils \
>+		ctf-spec \
> 		gprof \
> 		bfd \
> 		ld
>diff --git a/devel/binutils/distinfo b/devel/binutils/distinfo
>index 429395053a3a..29906643c282 100644
>--- a/devel/binutils/distinfo
>+++ b/devel/binutils/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1626719973
>-SHA256 (binutils-2.37.tar.xz) = 820d9724f020a3e69cb337893a0b63c2db161dadcb0e06fc11dc29eb1e84a32c
>-SIZE (binutils-2.37.tar.xz) = 22916924
>+TIMESTAMP = 1660760045
>+SHA256 (binutils-2.39.tar.lz) = 5ab51668874d8533201b8edd2edb5e5d81d588205c6da300c8919bd7cf8664e8
>+SIZE (binutils-2.39.tar.lz) = 24759528
>diff --git a/devel/binutils/files/patch-etc_texi2pod.pl b/devel/binutils/files/patch-etc_texi2pod.pl
>deleted file mode 100644
>index 456d44cfcdbd..000000000000
>--- a/devel/binutils/files/patch-etc_texi2pod.pl
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- etc/texi2pod.pl.orig	2021-08-30 17:17:09 UTC
>-+++ etc/texi2pod.pl
>-@@ -59,6 +59,8 @@ while ($_ = shift) {
>- 	    $flag = shift;
>- 	}
>-         push (@ipath, $flag);
>-+    } elsif (/^--no-split$/) {
>-+	# ignore option for makeinfo compatibility
>-     } elsif (/^-/) {
>- 	usage();
>-     } else {
>diff --git a/devel/binutils/files/patch-gold_gc.h b/devel/binutils/files/patch-gold_gc.h
>deleted file mode 100644
>index 5430f1897ee5..000000000000
>--- a/devel/binutils/files/patch-gold_gc.h
>+++ /dev/null
>@@ -1,45 +0,0 @@
>-From 10b4dbbf281397e2827820c715c39559c7f7a29d Mon Sep 17 00:00:00 2001
>-From: Alan Modra <amodra@gmail.com>
>-Date: Tue, 20 Jul 2021 18:46:57 +0930
>-Subject: [PATCH] PR28106, build of 2.37 fails on FreeBSD and Clang
>-
>-https://en.cppreference.com/w/cpp/types/NULL says NULL might be
>-defined as nullptr.
>-https://en.cppreference.com/w/cpp/language/reinterpret_cast says
>-reinterpret_cast can't be used on nullptr.
>-
>-	PR gold/28106
>-	PR gold/27815
>-	* gc.h (gc_process_relocs): Use static_cast in Section_id constructor.
>-
>-(cherry picked from commit b97bd976233ee4d43c2fe18f6356e62779cbe82d)
>----
>- gold/ChangeLog | 6 ++++++
>- gold/gc.h      | 4 ++--
>- 2 files changed, 8 insertions(+), 2 deletions(-)
>-
>-diff --git gold/gc.h gold/gc.h
>-index 6ebd81f3fd0..4a1368f5abe 100644
>---- gold/gc.h
>-+++ gold/gc.h
>-@@ -247,7 +247,7 @@ gc_process_relocs(
>- 	      if (is_ordinary) 
>- 		(*secvec).push_back(Section_id(src_obj, dst_indx));
>- 	      else
>--		(*secvec).push_back(Section_id(reinterpret_cast<Relobj*>(NULL), 0));
>-+		(*secvec).push_back(Section_id(static_cast<Relobj*>(NULL), 0));
>-               // If the target of the relocation is an STT_SECTION symbol,
>-               // make a note of that by storing -1 in the symbol vector.
>-               if (lsym.get_st_type() == elfcpp::STT_SECTION)
>-@@ -329,7 +329,7 @@ gc_process_relocs(
>-               if (is_ordinary && dst_obj != NULL)
>- 		(*secvec).push_back(Section_id(dst_obj, dst_indx));
>- 	      else
>--		(*secvec).push_back(Section_id(reinterpret_cast<Relobj*>(NULL), 0));
>-+		(*secvec).push_back(Section_id(static_cast<Relobj*>(NULL), 0));
>-               (*symvec).push_back(gsym);
>- 	      (*addendvec).push_back(std::make_pair(
>- 					static_cast<long long>(symvalue),
>--- 
>-2.32.0
>-
>diff --git a/devel/binutils/pkg-plist b/devel/binutils/pkg-plist
>index 2c8766973a3e..71a7c06f83ac 100644
>--- a/devel/binutils/pkg-plist
>+++ b/devel/binutils/pkg-plist
>@@ -100,6 +100,7 @@ man/man1/strip.1.gz
> %%NLS%%share/locale/ja/LC_MESSAGES/gas.mo
> %%NLS%%share/locale/ja/LC_MESSAGES/gprof.mo
> %%NLS%%share/locale/ja/LC_MESSAGES/ld.mo
>+%%NLS%%share/locale/ka/LC_MESSAGES/gprof.mo
> %%NLS%%share/locale/ms/LC_MESSAGES/gprof.mo
> %%NLS%%share/locale/nl/LC_MESSAGES/gprof.mo
> %%NLS%%share/locale/nl/LC_MESSAGES/opcodes.mo
>-- 
>2.37.2
>

Actions: View | Diff

Attachments on bug 265917: 235978 | 236016 | 237383 | 237731