tribes/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-04-06 21:20:33 +02:00
Code Activity

Revert "elf: Remove bundled Guile source."

Browse Source 
This reverts commit 11cf5b2fe4.
This commit is contained in:
Maxim Cournoyer
2025-10-30 16:19:49 +09:00
parent e0148efc7f
commit 9d60fdf6a2
19 changed files with 1076 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CODEOWNERS
View File

@@ -45,6 +45,7 @@ guix/diagnostics\.scm @guix/core
guix/discovery\.scm @guix/core
guix/docker\.scm @guix/core
guix/download\.scm @guix/core
guix/elf\.scm @guix/core
guix/ftp-client\.scm @guix/core
guix/gexp\.scm @guix/core
guix/git-authenticate\.scm @guix/core

1
Makefile.am
View File

@@ -201,6 +201,7 @@ MODULES = \
guix/ftp-client.scm \
guix/http-client.scm \
guix/gnupg.scm \
guix/elf.scm \
guix/profiling.scm \
guix/store.scm \
guix/cvs-download.scm \

1
etc/teams.scm
View File

@@ -510,6 +510,7 @@ already exists. Lookup team IDs among CURRENT-TEAMS."
"guix/discovery.scm"
"guix/docker.scm"
"guix/download.scm"
"guix/elf.scm"
"guix/ftp-client.scm"
"guix/gexp.scm"
"guix/git-authenticate.scm"

2
gnu/build/linux-modules.scm
View File

@@ -21,6 +21,7 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu build linux-modules)
#:use-module (guix elf)
#:use-module (guix glob)
#:use-module (guix build syscalls)
#:use-module ((guix build utils) #:select (find-files invoke))
@@ -38,7 +39,6 @@
#:use-module (ice-9 match)
#:use-module (ice-9 rdelim)
#:autoload (ice-9 pretty-print) (pretty-print)
#:use-module (system vm elf)
#:export (dot-ko
ensure-dot-ko
module-formal-name

2
gnu/packages/gnuzilla.scm
View File

@@ -927,7 +927,7 @@ preferences/advanced-scripts.dtd"
(srfi srfi-26)
(rnrs bytevectors)
(rnrs io ports)
(system vm elf)
(guix elf)
(guix build gremlin)
,@%default-gnu-modules)
#:phases

2
gnu/packages/librewolf.scm
View File

@@ -282,7 +282,7 @@
(srfi srfi-26)
(rnrs bytevectors)
(rnrs io ports)
(system vm elf)
(guix elf)
(guix build gremlin)
,@%default-gnu-imported-modules)
#:phases

2
gnu/packages/sequoia.scm
View File

@@ -318,7 +318,7 @@ This Guix package is built to use the nettle cryptographic library.")
(guix build union)
(guix build gnu-build-system)
(guix build gremlin)
(system vm elf))
(guix elf))
#:builder
#~(begin
(use-modules (guix build utils)

2
gnu/packages/tor-browsers.scm
View File

@@ -362,7 +362,7 @@ Browser.")
(srfi srfi-26)
(rnrs bytevectors)
(rnrs io ports)
(system vm elf)
(guix elf)
(guix build gremlin)
,@%default-gnu-imported-modules)
#:phases

2
gnu/packages/version-control.scm
View File

@@ -2948,7 +2948,7 @@ history. It implements the changeset evolution concept for Mercurial.")
(guix build utils)
(guix build gremlin)
(ice-9 ftw)
(system vm elf))
(guix elf))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-paths

3
guix/build-system/gnu.scm
View File

@@ -55,7 +55,8 @@
;; Build-side modules imported and used by default.
'((guix build gnu-build-system)
(guix build utils)
(guix build gremlin)))
(guix build gremlin)
(guix elf)))
(define-deprecated/public-alias %gnu-build-system-modules
%default-gnu-imported-modules)

2
guix/build/debug-link.scm
View File

@@ -18,6 +18,7 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (guix build debug-link)
#:use-module (guix elf)
#:use-module (guix build io)
#:use-module ((guix build utils)
#:select (find-files elf-file? make-file-writable))
@@ -25,7 +26,6 @@
#:use-module (rnrs io ports)
#:use-module (srfi srfi-1)
#:use-module (system foreign)
#:use-module (system vm elf)
#:use-module (ice-9 match)
#:export (debuglink-crc32
elf-debuglink

2
guix/build/gnu-build-system.scm
View File

@@ -22,6 +22,7 @@
(define-module (guix build gnu-build-system)
#:use-module (guix build utils)
#:use-module (guix build gremlin)
#:use-module (guix elf)
#:use-module (ice-9 ftw)
#:use-module (ice-9 match)
#:use-module (ice-9 regex)
@@ -34,7 +35,6 @@
#:use-module (srfi srfi-34)
#:use-module (srfi srfi-35)
#:use-module (srfi srfi-26)
#:use-module (system vm elf)
#:use-module (rnrs io ports)
#:export (%standard-phases
%license-file-regexp

2
guix/build/gremlin.scm
View File

@@ -18,6 +18,7 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (guix build gremlin)
#:use-module (guix elf)
#:use-module (guix build io)
#:use-module ((guix build utils) #:select (store-file-name?))
#:use-module (ice-9 match)
@@ -27,7 +28,6 @@
#:use-module (srfi srfi-34)
#:use-module (srfi srfi-35)
#:use-module (system foreign)
#:use-module (system vm elf)
#:use-module (rnrs bytevectors)
#:use-module (rnrs io ports)
#:export (elf-error?

2
guix/build/meson-build-system.scm
View File

@@ -24,10 +24,10 @@
#:use-module ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:)
#:use-module (guix build utils)
#:use-module (guix build gremlin)
#:use-module (guix elf)
#:use-module (ice-9 match)
#:use-module (rnrs io ports)
#:use-module (srfi srfi-1)
#:use-module (system vm elf)
#:export (%standard-phases
meson-build))

1046
guix/elf.scm Normal file
View File

File diff suppressed because it is too large Load Diff

6
guix/grafts.scm
View File

@@ -118,12 +118,12 @@ are not recursively applied to dependencies of DRV."
(define build
(with-imported-modules '((guix build graft)
(guix build utils)
(guix build debug-link))
(guix build debug-link)
(guix elf))
#~(begin
(use-modules (guix build graft)
(guix build utils)
(ice-9 match)
(system vm elf))
(ice-9 match))
(define %outputs
(ungexp (outputs->gexp outputs)))

7
guix/scripts/pack.scm
View File

@@ -1224,19 +1224,20 @@ libfakechroot.so and related ld.so machinery as a fallback."
'((guix build io)
(guix build utils)
(guix build union)
(guix build gremlin)))
(guix build gremlin)
(guix elf)))
#~(begin
(use-modules (guix build io)
(guix build utils)
((guix build union) #:select (symlink-relative))
(guix elf)
(guix build gremlin)
(ice-9 binary-ports)
(ice-9 ftw)
(ice-9 match)
(ice-9 receive)
(srfi srfi-1)
(rnrs bytevectors)
(system vm elf))
(rnrs bytevectors))
(define input
;; The OUTPUT* output of PACKAGE.

12
tests/debug-link.scm
View File

@@ -18,6 +18,7 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (test-debug-link)
#:use-module (guix elf)
#:use-module (guix build utils)
#:use-module (guix build debug-link)
#:use-module (guix build io)
@@ -32,7 +33,6 @@
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-26)
#:use-module (srfi srfi-64)
#:use-module (system vm elf)
#:use-module (rnrs io ports)
#:use-module (ice-9 match))
@@ -69,12 +69,13 @@
(exp (with-imported-modules (source-module-closure
'((guix build io)
(guix build utils)
(guix build debug-link)))
(guix build debug-link)
(guix elf)))
#~(begin
(use-modules (guix build io)
(guix build utils)
(guix build debug-link)
(system vm elf)
(guix elf)
(rnrs io ports))
(define read-elf
@@ -114,12 +115,13 @@
(exp (with-imported-modules (source-module-closure
'((guix build io)
(guix build utils)
(guix build debug-link)))
(guix build debug-link)
(guix elf)))
#~(begin
(use-modules (guix build io)
(guix build utils)
(guix build debug-link)
(system vm elf)
(guix elf)
(rnrs io ports))
(define read-elf

2
tests/gremlin.scm
View File

@@ -19,6 +19,7 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (test-gremlin)
#:use-module (guix elf)
#:use-module (guix tests)
#:use-module ((guix utils) #:select (call-with-temporary-directory
target-aarch64?))
@@ -30,7 +31,6 @@
#:use-module (srfi srfi-26)
#:use-module (srfi srfi-34)
#:use-module (srfi srfi-64)
#:use-module (system vm elf)
#:use-module (rnrs io ports)
#:use-module (ice-9 popen)
#:use-module (ice-9 rdelim)