me
/
guix
Archived
1
0
Fork 0
Code

build-system: Fix uses of #:strip-flags and #:strip-directories. 

This fixes a bug introduced in ccc2658e2a,
reported at <https://issues.guix.gnu.org/issue/58384>.

Tested with "./pre-inst-env guix build openjpeg-data".

Fixes: https://issues.guix.gnu.org/issue/58384

* guix/build-system/copy.scm (copy-build): 'strip-flags' and
'#:strip-directories' are G-exps, not S-exps, so don't use sexp->gexp.
* guix/build-system/cmake.scm (copy-build): Likewise.
* guix/build-system/glib-or-gtk.scm
(glib-or-gtk-build,glib-or-gtk-cross-build): Likewise.
* guix/build-system/maven.scm (maven-build): Likewise.
* guix/build-system/meson.scm
(meson-build,meson-cross-build): Likewise.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
master
Maxime Devos 2022-10-09 11:39:16 +02:00 committed by Ludovic Courtès
parent ccc2658e2a
commit 77759234a3
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
guix/build-system/cmake.scm
View File

@ -149,8 +149,8 @@ provides a 'CMakeLists.txt' file as its build system."
#:validate-runpath? #$validate-runpath?
#:patch-shebangs? #$patch-shebangs?
#:strip-binaries? #$strip-binaries?
#:strip-flags #$(sexp->gexp strip-flags)
#:strip-directories #$(sexp->gexp strip-directories))))))
#:strip-flags #$strip-flags
#:strip-directories #$strip-directories)))))
(mlet %store-monad ((guile (package->derivation (or guile (default-guile))
system #:graft? #f)))

4
guix/build-system/copy.scm
View File

@ -122,8 +122,8 @@
#:validate-runpath? #$validate-runpath?
#:patch-shebangs? #$patch-shebangs?
#:strip-binaries? #$strip-binaries?
#:strip-flags #$(sexp->gexp strip-flags)
#:strip-directories #$(sexp->gexp strip-directories))))))
#:strip-flags #$strip-flags
#:strip-directories #$strip-directories)))))
(mlet %store-monad ((guile (package->derivation (or guile (default-guile))
system #:graft? #f)))

8
guix/build-system/glib-or-gtk.scm
View File

@ -178,9 +178,9 @@
#:validate-runpath? #$validate-runpath?
#:patch-shebangs? #$patch-shebangs?
#:strip-binaries? #$strip-binaries?
#:strip-flags #$(sexp->gexp strip-flags)
#:strip-flags #$strip-flags
#:strip-directories
#$(sexp->gexp strip-directories))))))
#$strip-directories)))))
(mlet %store-monad ((guile (package->derivation (or guile (default-guile))
@ -271,9 +271,9 @@
#:make-dynamic-linker-cache? #$make-dynamic-linker-cache?
#:patch-shebangs? #$patch-shebangs?
#:strip-binaries? #$strip-binaries?
#:strip-flags #$(sexp->gexp strip-flags)
#:strip-flags #$strip-flags
#:strip-directories
#$(sexp->gexp strip-directories))))
#$strip-directories)))
(mlet %store-monad ((guile (package->derivation (or guile (default-guile))

4
guix/build-system/maven.scm
View File

@ -183,8 +183,8 @@ provides its own binaries."
#:validate-runpath? #$validate-runpath?
#:patch-shebangs? #$patch-shebangs?
#:strip-binaries? #$strip-binaries?
#:strip-flags #$(sexp->gexp strip-flags)
#:strip-directories #$(sexp->gexp strip-directories)))))
#:strip-flags #$strip-flags
#:strip-directories #$strip-directories))))
(mlet %store-monad ((guile (package->derivation (or guile (default-guile))
system #:graft? #f)))

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

@ -227,8 +227,8 @@ has a 'meson.build' file."
#:validate-runpath? #$validate-runpath?
#:patch-shebangs? #$patch-shebangs?
#:strip-binaries? #$strip-binaries?
#:strip-flags #$(sexp->gexp strip-flags)
#:strip-directories #$(sexp->gexp strip-directories)
#:strip-flags #$strip-flags
#:strip-directories #$strip-directories
#:elf-directories #$(sexp->gexp elf-directories))))))
(mlet %store-monad ((guile (package->derivation (or guile (default-guile))
@ -339,8 +339,8 @@ SOURCE has a 'meson.build' file."
#:validate-runpath? #$validate-runpath?
#:patch-shebangs? #$patch-shebangs?
#:strip-binaries? #$strip-binaries?
#:strip-flags #$(sexp->gexp strip-flags)
#:strip-directories #$(sexp->gexp strip-directories)
#:strip-flags #$strip-flags
#:strip-directories #$strip-directories
#:elf-directories #$(sexp->gexp elf-directories)))))
(mlet %store-monad ((guile (package->derivation (or guile (default-guile))