diff options
| author | Maxime Devos <maximedevos@telenet.be> | 2022-10-09 11:39:16 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2022-10-09 18:53:32 +0200 |
| commit | 77759234a3c436816297dd1e989704e37489a129 (patch) | |
| tree | e65e122628ff789455b148dbe3eec9280a4bf31f /guix/build-system | |
| parent | ccc2658e2a111590ec25e308946e47a24d357785 (diff) | |
| download | guix-77759234a3c436816297dd1e989704e37489a129.tar.gz | |
build-system: Fix uses of #:strip-flags and #:strip-directories.
This fixes a bug introduced in ccc2658e2a111590ec25e308946e47a24d357785, 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>
Diffstat (limited to 'guix/build-system')
| -rw-r--r-- | guix/build-system/cmake.scm | 4 | ||||
| -rw-r--r-- | guix/build-system/copy.scm | 4 | ||||
| -rw-r--r-- | guix/build-system/glib-or-gtk.scm | 8 | ||||
| -rw-r--r-- | guix/build-system/maven.scm | 4 | ||||
| -rw-r--r-- | guix/build-system/meson.scm | 8 |
5 files changed, 14 insertions, 14 deletions
diff --git a/guix/build-system/cmake.scm b/guix/build-system/cmake.scm index ffd04867a2..effb54f044 100644 --- a/guix/build-system/cmake.scm +++ b/guix/build-system/cmake.scm @@ -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))) diff --git a/guix/build-system/copy.scm b/guix/build-system/copy.scm index ea85719286..bf7fcaedba 100644 --- a/guix/build-system/copy.scm +++ b/guix/build-system/copy.scm @@ -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))) diff --git a/guix/build-system/glib-or-gtk.scm b/guix/build-system/glib-or-gtk.scm index a9041bb9f9..f4f431273b 100644 --- a/guix/build-system/glib-or-gtk.scm +++ b/guix/build-system/glib-or-gtk.scm @@ -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)) diff --git a/guix/build-system/maven.scm b/guix/build-system/maven.scm index c5a26c8754..9a17dea977 100644 --- a/guix/build-system/maven.scm +++ b/guix/build-system/maven.scm @@ -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))) diff --git a/guix/build-system/meson.scm b/guix/build-system/meson.scm index e75c1a17cb..ba3ffa6b1c 100644 --- a/guix/build-system/meson.scm +++ b/guix/build-system/meson.scm @@ -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)) |