janneke pushed a commit to branch core-packages-team-old in repository guix.
commit 12f87492bf9c0f08dc1dd53a78389e7a3ede0414 Author: Zheng Junjie <[email protected]> AuthorDate: Sat Feb 8 18:25:19 2025 +0800 gnu: binutils: Update to 2.44. * gnu/packages/patches/binutils-2.41-fix-cross.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/base.scm (binutils): Update to 2.44 and use it. Change-Id: Ia54b0e7a076b1fe162524bf76a1ab4031792bc32 --- gnu/local.mk | 1 + gnu/packages/base.scm | 8 +-- gnu/packages/patches/binutils-2.41-fix-cross.patch | 63 ++++++++++++++++++++++ 3 files changed, 69 insertions(+), 3 deletions(-) diff --git a/gnu/local.mk b/gnu/local.mk index 0b5ff14448..4d59992469 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1054,6 +1054,7 @@ dist_patch_DATA = \ %D%/packages/patches/binutils-loongson-workaround.patch \ %D%/packages/patches/binutils-mingw-w64-timestamp.patch \ %D%/packages/patches/binutils-mingw-w64-deterministic.patch \ + %D%/packages/patches/binutils-2.41-fix-cross.patch \ %D%/packages/patches/bloomberg-bde-cmake-module-path.patch \ %D%/packages/patches/bloomberg-bde-tools-fix-install-path.patch \ %D%/packages/patches/boolector-find-googletest.patch \ diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index a138e09fec..47a864f227 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -715,15 +715,17 @@ change. GNU make offers many powerful extensions over the standard utility.") (define-public binutils (package (name "binutils") - (version "2.41") + (version "2.44") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/binutils/binutils-" version ".tar.bz2")) (sha256 - (base32 "02xkm9xgcrqhln742636nm43yzrpjkhqj0z64h03gf7pab0bxi54")) - (patches (search-patches "binutils-loongson-workaround.patch")))) + (base32 "0fnwaasfglbphqzvz5n25js9gl695p7pjbmb1z81g8gsc6k90qzn")) + (patches (search-patches + "binutils-2.41-fix-cross.patch" + "binutils-loongson-workaround.patch")))) (build-system gnu-build-system) (arguments (list #:out-of-source? #t ;recommended in the README diff --git a/gnu/packages/patches/binutils-2.41-fix-cross.patch b/gnu/packages/patches/binutils-2.41-fix-cross.patch new file mode 100644 index 0000000000..40a19e091d --- /dev/null +++ b/gnu/packages/patches/binutils-2.41-fix-cross.patch @@ -0,0 +1,63 @@ +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 +
