~ruther/guix-local

06a8d2a0c57362ff2259333c46b2a890e240cf37 — Zheng Junjie 1 year, 8 months ago d62a455
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
3 files changed, 69 insertions(+), 3 deletions(-)

M gnu/local.mk
M gnu/packages/base.scm
A gnu/packages/patches/binutils-2.41-fix-cross.patch
M gnu/local.mk => gnu/local.mk +1 -0
@@ 1070,6 1070,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/binutils-boot-2.20.1a.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/bloomberg-bde-cmake-module-path.patch	\
  %D%/packages/patches/bloomberg-bde-tools-fix-install-path.patch	\
  %D%/packages/patches/boolector-find-googletest.patch	\

M gnu/packages/base.scm => gnu/packages/base.scm +5 -3
@@ 683,15 683,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

A gnu/packages/patches/binutils-2.41-fix-cross.patch => gnu/packages/patches/binutils-2.41-fix-cross.patch +63 -0
@@ 0,0 1,63 @@
From b499f0c797779a6d7ff01445aebd2fcc47aac357 Mon Sep 17 00:00:00 2001
From: Zheng Junjie <zhengjunjie@iscas.ac.cn>
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  <zhengjunjie@iscas.ac.cn>
	* 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