From d65646baf240f3a00a05eeac4b72215397f91822 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim@guixotic.coop>
Date: Thu, 30 Oct 2025 16:19:57 +0900
Subject: [PATCH] Revert "build/gnu: Add a compress-debug-info phase."

This reverts commit 0688d2717416579cb455cac389e541f74be00a85.
---
 guix/build/gnu-build-system.scm | 65 +--------------------------------
 1 file changed, 2 insertions(+), 63 deletions(-)

diff --git a/guix/build/gnu-build-system.scm b/guix/build/gnu-build-system.scm
index 8183762ce1..f7fd7c0818 100644
--- a/guix/build/gnu-build-system.scm
+++ b/guix/build/gnu-build-system.scm
@@ -2,7 +2,7 @@
 ;;; Copyright © 2012-2021, 2025 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2018 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2020 Brendan Tildesley <mail@brendan.scot>
-;;; Copyright © 2021, 2022, 2025 Maxim Cournoyer <maxim@guixotic.coop>
+;;; Copyright © 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -28,7 +28,6 @@
   #:use-module (ice-9 regex)
   #:use-module (ice-9 format)
   #:use-module (ice-9 ftw)
-  #:use-module (ice-9 popen)
   #:use-module (ice-9 threads)
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-19)
@@ -578,66 +577,6 @@ makefiles."
                                 strip-directories)))
                  outputs))))
 
-(define* (compress-debug-info
-          #:key parallel-build? target outputs
-          (objcopy-command (if target
-                               (string-append target "-objcopy")
-                               "objcopy"))
-          (dwz-command (which "dwz"))
-          #:allow-other-keys)
-  (define debug-output (assoc-ref outputs "debug"))
-  (when debug-output
-    (let* ((common-file (string-append debug-output
-                                       "/lib/debug/" (assoc-ref outputs "out")
-                                       "/common.debug"))
-           (shared-object-file?
-            (lambda (file)
-              (and (elf-file? file)
-                   (member (call-with-input-file file
-                             (compose elf-type parse-elf
-                                      get-bytevector-all))
-                           (list ET_EXEC ET_DYN)))))
-           (objcopy-can-compress?
-            (let* ((input-pipe (open-pipe* OPEN_READ "objcopy" "--help"))
-                   (output (get-string-all input-pipe)))
-              (close-pipe input-pipe)
-              (string-contains output "--compress-debug-sections")))
-           ;; DWZ only operates on ELF shared object files.
-           (debug-files (find-files debug-output
-                                    (lambda (f st)
-                                      ;; Ignore symlinks.
-                                      (and (eq? 'regular (stat:type st))
-                                           (shared-object-file? f)))
-                                    #:stat lstat))
-           (debug-files-count (length debug-files)))
-      (unless (zero? debug-files-count)
-        (when (> debug-files-count 1)
-          (mkdir-p (dirname common-file)))
-        ;; Deduplicate debug symbols with DWZ.
-        (when dwz-command               ;not available during early bootstrap
-          (apply invoke dwz-command
-                 "-j" (number->string (if parallel-build?
-                                          (parallel-job-count)
-                                          1))
-                 `(,@(if (> debug-files-count 1)
-                         `("--multifile" ,common-file)
-                         '())
-                   ,@debug-files)))
-        ;; Compress the debug sections with Zstd
-        (when objcopy-can-compress?     ;not available during early bootstrap
-          ;; It's safe to use multiple threads as objcopy produces no output.
-          (n-par-for-each (if parallel-build?
-                              (parallel-job-count)
-                              1)
-                          (lambda (f)
-                            (make-file-writable f)
-                            (or (false-if-exception
-                                 (invoke objcopy-command
-                                         "--compress-debug-sections=zstd" f))
-                                (invoke objcopy-command
-                                        "--compress-debug-sections=zlib" f)))
-                          debug-files))))))
-
 (define* (validate-runpath #:key
                            (validate-runpath? #t)
                            (elf-directories '("lib" "lib64" "libexec"
@@ -1012,7 +951,7 @@ that traversing all the RUNPATH entries entails."
             patch-usr-bin-file
             patch-source-shebangs configure patch-generated-file-shebangs
             build check install
-            patch-shebangs strip compress-debug-info
+            patch-shebangs strip
             validate-runpath
             validate-documentation-location
             delete-info-dir-file