amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'staging'

Browse source 
Conflicts:
	gnu/packages/admin.scm
	gnu/packages/commencement.scm
	gnu/packages/gdb.scm
	gnu/packages/llvm.scm
	gnu/packages/package-management.scm
	gnu/packages/tls.scm
This commit is contained in:
Maxim Cournoyer 2020-10-19 12:51:57 -04:00
commit 5e2140511c
No known key found for this signature in database
GPG key ID: 1260E46482E63562
414 changed files with 131682 additions and 64151 deletions
Download patch file Download diff file Expand all files Collapse all files

39
guix/scripts/pack.scm
View file

@ -826,11 +826,17 @@ last resort for relocation."
(string-append "-DLOADER_AUDIT_MODULE=\""
#$(audit-module) "\"")
;; XXX: Normally (runpath #$(audit-module)) is
;; enough. However, to work around
;; <https://sourceware.org/bugzilla/show_bug.cgi?id=26634>
;; (glibc <= 2.32), pass the whole search path of
;; PROGRAM, which presumably is a superset of that
;; of the audit module.
(string-append "-DLOADER_AUDIT_RUNPATH={ "
(string-join
(map object->string
(runpath
#$(audit-module)))
(runpath program))
", " 'suffix)
"NULL }")
(if gconv
@ -1143,19 +1149,24 @@ Create a bundle of PACKAGE.\n"))
manifest))
identity))
(define (with-transformations manifest)
(map-manifest-entries manifest-entry-with-transformations
manifest))
(with-provenance
(cond
((and (not (null? manifests)) (not (null? packages)))
(leave (G_ "both a manifest and a package list were given~%")))
((not (null? manifests))
(concatenate-manifests
(map (lambda (file)
(let ((user-module (make-user-module
'((guix profiles) (gnu)))))
(load* file user-module)))
manifests)))
(else
(packages->manifest packages))))))
(with-transformations
(cond
((and (not (null? manifests)) (not (null? packages)))
(leave (G_ "both a manifest and a package list were given~%")))
((not (null? manifests))
(concatenate-manifests
(map (lambda (file)
(let ((user-module (make-user-module
'((guix profiles) (gnu)))))
(load* file user-module)))
manifests)))
(else
(packages->manifest packages)))))))
(with-error-handling
(with-store store