guix_mirror_bot pushed a commit to branch core-packages-team in repository guix.
commit a4e491fe581fa7a952880b9c169ea748d6dddece Author: Yelninei <[email protected]> AuthorDate: Thu May 7 12:10:04 2026 +0000 gnu: binutils: Update to 2.46.1. Cross-fix is upstreamed as commit 90803ffdcc4d8c3d17566bf8dccadbad312f07a9. * gnu/packages/base.scm (binutils): Update to 2.46.1. * gnu/packages/patches/binutils-2.41-fix-cross.patch: Remove patch. * gnu/local.mk (dist_patch_DATA): Deregister it. Change-Id: I348ec9a8cccfe94d8e0f7d7ac44e227c924246dd --- gnu/local.mk | 1 - gnu/packages/base.scm | 5 +- gnu/packages/patches/binutils-2.41-fix-cross.patch | 63 ---------------------- 3 files changed, 2 insertions(+), 67 deletions(-) diff --git a/gnu/local.mk b/gnu/local.mk index ce8065531d..820cf1b174 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1078,7 +1078,6 @@ dist_patch_DATA = \ %D%/packages/patches/binutils-cross-windres.patch \ %D%/packages/patches/binutils-loongson-workaround.patch \ %D%/packages/patches/binutils-mingw-w64-deterministic.patch \ - %D%/packages/patches/binutils-2.41-fix-cross.patch \ %D%/packages/patches/binutils-reproducible-tar.patch \ %D%/packages/patches/bloomberg-bde-tools-fix-install-path.patch \ %D%/packages/patches/bmake-run-check-separately.patch \ diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 1ba3e8efc0..84a4e65975 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -685,17 +685,16 @@ change. GNU make offers many powerful extensions over the standard utility.") (define-public binutils (package (name "binutils") - (version "2.44") + (version "2.46.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/binutils/binutils-" version ".tar.bz2")) (sha256 - (base32 "0fnwaasfglbphqzvz5n25js9gl695p7pjbmb1z81g8gsc6k90qzn")) + (base32 "0fd45n9rrymplx41vk32676d6pqnvfjlq42xma7a4cr6v85d8kij")) (patches (search-patches "binutils-reproducible-tar.patch" - "binutils-2.41-fix-cross.patch" "binutils-loongson-workaround.patch")))) (build-system gnu-build-system) (arguments diff --git a/gnu/packages/patches/binutils-2.41-fix-cross.patch b/gnu/packages/patches/binutils-2.41-fix-cross.patch deleted file mode 100644 index 40a19e091d..0000000000 --- a/gnu/packages/patches/binutils-2.41-fix-cross.patch +++ /dev/null @@ -1,63 +0,0 @@ -From b499f0c797779a6d7ff01445aebd2fcc47aac357 Mon Sep 17 00:00:00 2001 -From: Zheng Junjie <[email protected]> -Date: Mon, 10 Feb 2025 17:04:55 +0800 -Subject: [PATCH] gprofng: Fix cross-compilation binary name. - -commit d25ba4596e85da6d8af78c88b5917e14763afbe1 create symbolic link -no care cross-compilation prefix. - -gprofng/ChangeLog -2025-02-10 Zheng Junjie <[email protected]> - * src/Makefile.am: create symbolic link respect cross-compilation. - * src/Makefile.in: Rebuild. ---- - gprofng/src/Makefile.am | 12 +++++------- - gprofng/src/Makefile.in | 12 +++++------- - 2 files changed, 10 insertions(+), 14 deletions(-) - -diff --git a/gprofng/src/Makefile.am b/gprofng/src/Makefile.am -index a132a9ddb05..0465cdb06e3 100644 ---- a/gprofng/src/Makefile.am -+++ b/gprofng/src/Makefile.am -@@ -179,10 +179,8 @@ $(srcdir)/DbeSession.cc: QLParser.tab.hh - .PHONY: install-exec-local - install-exec-local: - $(mkinstalldirs) $(DESTDIR)$(bindir) -- rm -f $(DESTDIR)$(bindir)/gp-{archive,collect-app,display-html,display-src,display-text} -- ln -s gprofng-archive $(DESTDIR)$(bindir)/gp-archive -- ln -s gprofng-collect-app $(DESTDIR)$(bindir)/gp-collect-app -- ln -s gprofng-display-html $(DESTDIR)$(bindir)/gp-display-html -- ln -s gprofng-display-src $(DESTDIR)$(bindir)/gp-display-src -- ln -s gprofng-display-text $(DESTDIR)$(bindir)/gp-display-text -- -+ for i in gp-{archive,collect-app,display-html,display-src,display-text}; do \ -+ oldname=`echo $$i | sed '$(transform)'`; \ -+ rm -f $(DESTDIR)$(bindir)/$$oldname ; \ -+ ln -s `echo $$oldname | sed 's&gp-&gprofng-&'` $(DESTDIR)$(bindir)/$$oldname; \ -+ done -diff --git a/gprofng/src/Makefile.in b/gprofng/src/Makefile.in -index d0dec12e244..d6f1f9438b6 100644 ---- a/gprofng/src/Makefile.in -+++ b/gprofng/src/Makefile.in -@@ -1119,13 +1119,11 @@ $(srcdir)/DbeSession.cc: QLParser.tab.hh - .PHONY: install-exec-local - install-exec-local: - $(mkinstalldirs) $(DESTDIR)$(bindir) -- rm -f $(DESTDIR)$(bindir)/gp-{archive,collect-app,display-html,display-src,display-text} -- ln -s gprofng-archive $(DESTDIR)$(bindir)/gp-archive -- ln -s gprofng-collect-app $(DESTDIR)$(bindir)/gp-collect-app -- ln -s gprofng-display-html $(DESTDIR)$(bindir)/gp-display-html -- ln -s gprofng-display-src $(DESTDIR)$(bindir)/gp-display-src -- ln -s gprofng-display-text $(DESTDIR)$(bindir)/gp-display-text -- -+ for i in gp-{archive,collect-app,display-html,display-src,display-text}; do \ -+ oldname=`echo $$i | sed '$(transform)'`; \ -+ rm -f $(DESTDIR)$(bindir)/$$oldname ; \ -+ ln -s `echo $$oldname | sed 's&gp-&gprofng-&'` $(DESTDIR)$(bindir)/$$oldname; \ -+ done - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: --- -2.47.1 -
