* bug#63456: mesa build failure at guix package -u
@ 2023-05-12 6:17 Andy Tai
[not found] ` <handler.63456.B.168387230426721.ack@debbugs.gnu.org>
2023-05-12 6:50 ` bug#63456: [PATCH] gnu: mesa-opencl: Remove reference to patch Andy Tai
0 siblings, 2 replies; 5+ messages in thread
From: Andy Tai @ 2023-05-12 6:17 UTC (permalink / raw)
To: 63456
When I do guix package -u from the current guix repo,
mesa build fails at mesa,
key parts of build log:
mesa-23.0.3/subprojects/expat.wrap
mesa-23.0.3/subprojects/perfetto.wrap
mesa-23.0.3/subprojects/zlib.wrap
patching file meson.build
Hunk #1 FAILED at 1479.
1 out of 1 hunk FAILED -- saving rejects to file meson.build.rej
source is at 'mesa-23.0.3'
applying '/gnu/store/r0ipng37a0bvfbczhy791ayg4kx1wkld-mesa-opencl-all-targets.patch'...
Backtrace:
5 (primitive-load "/gnu/store/jz07f808827d1r0wn3rppv2i4lj…")
In ice-9/eval.scm:
619:8 4 (_ #(#(#<directory (guile-user) 7ffff77f7c80> "mes…") #))
In ice-9/boot-9.scm:
142:2 3 (dynamic-wind #<procedure 7ffff776a640 at ice-9/eval.s…> …)
In ice-9/eval.scm:
619:8 2 (_ #(#(#<directory (guile-user) 7ffff77f7c80>)))
In srfi/srfi-1.scm:
634:9 1 (for-each #<procedure apply-patch (a)> ("/gnu/store/r0…"))
In guix/build/utils.scm:
812:6 0 (invoke "/gnu/store/210yfax18r2g2inxrml9435ikhfcca6m-p…" …)
guix/build/utils.scm:812:6: In procedure invoke:
ERROR:
1. &invoke-error:
program: "/gnu/store/210yfax18r2g2inxrml9435ikhfcca6m-patch-2.7.6/bin/patch"
arguments: ("--force" "--no-backup-if-mismatch" "-p1" "--input"
"/gnu/store/r0ipng37a0bvfbczhy791ayg4kx1wkld-mesa-opencl-all-targets.patch")
exit-status: 1
term-signal: #f
stop-signal: #f
^ permalink raw reply [flat|nested] 5+ messages in thread[parent not found: <handler.63456.B.168387230426721.ack@debbugs.gnu.org>]
* bug#63456: Acknowledgement (mesa build failure at guix package -u) [not found] ` <handler.63456.B.168387230426721.ack@debbugs.gnu.org> @ 2023-05-12 6:31 ` Andy Tai 0 siblings, 0 replies; 5+ messages in thread From: Andy Tai @ 2023-05-12 6:31 UTC (permalink / raw) To: 63456 the actual package failing to build is mesa-opencl, not mesa itself ^ permalink raw reply [flat|nested] 5+ messages in thread
* bug#63456: [PATCH] gnu: mesa-opencl: Remove reference to patch 2023-05-12 6:17 bug#63456: mesa build failure at guix package -u Andy Tai [not found] ` <handler.63456.B.168387230426721.ack@debbugs.gnu.org> @ 2023-05-12 6:50 ` Andy Tai 2023-05-13 5:09 ` Andy Tai 2023-05-14 8:56 ` Guillaume Le Vaillant 1 sibling, 2 replies; 5+ messages in thread From: Andy Tai @ 2023-05-12 6:50 UTC (permalink / raw) To: 63456; +Cc: Andy Tai Fixes <https://bugs.gnu.org/63456>. * gnu/packages/patches/mesa-opencl-all-targets.patch: Removed * gnu/local.mk: Remove reference to mesa-opencl-all-targets.patch * gnu/packages/gl.scm (mesa-opencl)[source]::Remove patch application of mesa-opencl-all-targets.patch --- gnu/local.mk | 1 - gnu/packages/gl.scm | 4 +-- .../patches/mesa-opencl-all-targets.patch | 25 ------------------- 3 files changed, 1 insertion(+), 29 deletions(-) delete mode 100644 gnu/packages/patches/mesa-opencl-all-targets.patch diff --git a/gnu/local.mk b/gnu/local.mk index 73db48f720..73180be88a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1561,7 +1561,6 @@ dist_patch_DATA = \ %D%/packages/patches/memtest86+-build-reproducibly.patch \ %D%/packages/patches/mercurial-hg-extension-path.patch \ %D%/packages/patches/mercurial-openssl-compat.patch \ - %D%/packages/patches/mesa-opencl-all-targets.patch \ %D%/packages/patches/mhash-keygen-test-segfault.patch \ %D%/packages/patches/mia-fix-boost-headers.patch \ %D%/packages/patches/mia-vtk9.patch \ diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 235b386dad..030c828e5b 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -530,9 +530,7 @@ (define-public mesa-opencl (package/inherit mesa (name "mesa-opencl") (source (origin - (inherit (package-source mesa)) - (patches (cons (search-patch "mesa-opencl-all-targets.patch") - (origin-patches (package-source mesa)))))) + (inherit (package-source mesa)))) (arguments (substitute-keyword-arguments (package-arguments mesa) ((#:configure-flags flags) diff --git a/gnu/packages/patches/mesa-opencl-all-targets.patch b/gnu/packages/patches/mesa-opencl-all-targets.patch deleted file mode 100644 index 99d4abcea4..0000000000 --- a/gnu/packages/patches/mesa-opencl-all-targets.patch +++ /dev/null @@ -1,25 +0,0 @@ -This patch restores LLVM targets needed for OpenCL, *reverting* this -upstream commit: - - From 80817b6e344258ac9b955f824ebf9019a0fc1610 Mon Sep 17 00:00:00 2001 - From: Jesse Natalie <jenatali@microsoft.com> - Date: Wed, 18 Nov 2020 18:30:30 -0800 - Subject: [PATCH] meson: Adjust Clover's required LLVM modules - -diff --git a/meson.build b/meson.build -index 6d1607c35a3..f828eb80faa 100644 ---- b/meson.build -+++ a/meson.build -@@ -1479,10 +1479,9 @@ - endif - if with_gallium_opencl - llvm_modules += [ -- 'linker', 'coverage', 'instrumentation', 'ipo', 'irreader', -- 'lto', 'option', 'objcarcopts', 'profiledata' -+ 'all-targets', 'linker', 'coverage', 'instrumentation', 'ipo', 'irreader', -+ 'lto', 'option', 'objcarcopts', 'profiledata', - ] -- llvm_optional_modules += ['frontendopenmp'] - endif - if with_microsoft_clc - llvm_modules += ['target', 'linker', 'irreader', 'option', 'libdriver'] base-commit: d6f6b57766e95d2fa8af63d4460a2b303ca4d867 -- 2.39.2 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* bug#63456: [PATCH] gnu: mesa-opencl: Remove reference to patch 2023-05-12 6:50 ` bug#63456: [PATCH] gnu: mesa-opencl: Remove reference to patch Andy Tai @ 2023-05-13 5:09 ` Andy Tai 2023-05-14 8:56 ` Guillaume Le Vaillant 1 sibling, 0 replies; 5+ messages in thread From: Andy Tai @ 2023-05-13 5:09 UTC (permalink / raw) To: guix-patches, 63456; +Cc: Andy Tai Fixes <https://bugs.gnu.org/63456>. * gnu/packages/patches/mesa-opencl-all-targets.patch: Removed * gnu/local.mk: Remove reference to mesa-opencl-all-targets.patch * gnu/packages/gl.scm (mesa-opencl)[source]::Remove patch application of mesa-opencl-all-targets.patch --- gnu/local.mk | 1 - gnu/packages/gl.scm | 4 +-- .../patches/mesa-opencl-all-targets.patch | 25 ------------------- 3 files changed, 1 insertion(+), 29 deletions(-) delete mode 100644 gnu/packages/patches/mesa-opencl-all-targets.patch diff --git a/gnu/local.mk b/gnu/local.mk index 73db48f720..73180be88a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1561,7 +1561,6 @@ dist_patch_DATA = \ %D%/packages/patches/memtest86+-build-reproducibly.patch \ %D%/packages/patches/mercurial-hg-extension-path.patch \ %D%/packages/patches/mercurial-openssl-compat.patch \ - %D%/packages/patches/mesa-opencl-all-targets.patch \ %D%/packages/patches/mhash-keygen-test-segfault.patch \ %D%/packages/patches/mia-fix-boost-headers.patch \ %D%/packages/patches/mia-vtk9.patch \ diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 235b386dad..030c828e5b 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -530,9 +530,7 @@ (define-public mesa-opencl (package/inherit mesa (name "mesa-opencl") (source (origin - (inherit (package-source mesa)) - (patches (cons (search-patch "mesa-opencl-all-targets.patch") - (origin-patches (package-source mesa)))))) + (inherit (package-source mesa)))) (arguments (substitute-keyword-arguments (package-arguments mesa) ((#:configure-flags flags) diff --git a/gnu/packages/patches/mesa-opencl-all-targets.patch b/gnu/packages/patches/mesa-opencl-all-targets.patch deleted file mode 100644 index 99d4abcea4..0000000000 --- a/gnu/packages/patches/mesa-opencl-all-targets.patch +++ /dev/null @@ -1,25 +0,0 @@ -This patch restores LLVM targets needed for OpenCL, *reverting* this -upstream commit: - - From 80817b6e344258ac9b955f824ebf9019a0fc1610 Mon Sep 17 00:00:00 2001 - From: Jesse Natalie <jenatali@microsoft.com> - Date: Wed, 18 Nov 2020 18:30:30 -0800 - Subject: [PATCH] meson: Adjust Clover's required LLVM modules - -diff --git a/meson.build b/meson.build -index 6d1607c35a3..f828eb80faa 100644 ---- b/meson.build -+++ a/meson.build -@@ -1479,10 +1479,9 @@ - endif - if with_gallium_opencl - llvm_modules += [ -- 'linker', 'coverage', 'instrumentation', 'ipo', 'irreader', -- 'lto', 'option', 'objcarcopts', 'profiledata' -+ 'all-targets', 'linker', 'coverage', 'instrumentation', 'ipo', 'irreader', -+ 'lto', 'option', 'objcarcopts', 'profiledata', - ] -- llvm_optional_modules += ['frontendopenmp'] - endif - if with_microsoft_clc - llvm_modules += ['target', 'linker', 'irreader', 'option', 'libdriver'] base-commit: d6f6b57766e95d2fa8af63d4460a2b303ca4d867 -- 2.39.2 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* bug#63456: [PATCH] gnu: mesa-opencl: Remove reference to patch 2023-05-12 6:50 ` bug#63456: [PATCH] gnu: mesa-opencl: Remove reference to patch Andy Tai 2023-05-13 5:09 ` Andy Tai @ 2023-05-14 8:56 ` Guillaume Le Vaillant 1 sibling, 0 replies; 5+ messages in thread From: Guillaume Le Vaillant @ 2023-05-14 8:56 UTC (permalink / raw) To: Andy Tai; +Cc: 63456-done [-- Attachment #1: Type: text/plain, Size: 66 bytes --] Patch pushed as 930e6e3e7a1c5f83aedb49f6fa0ebb0e0bdeeef3. Thanks. [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 247 bytes --] ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-05-14 8:58 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-05-12 6:17 bug#63456: mesa build failure at guix package -u Andy Tai
[not found] ` <handler.63456.B.168387230426721.ack@debbugs.gnu.org>
2023-05-12 6:31 ` bug#63456: Acknowledgement (mesa build failure at guix package -u) Andy Tai
2023-05-12 6:50 ` bug#63456: [PATCH] gnu: mesa-opencl: Remove reference to patch Andy Tai
2023-05-13 5:09 ` Andy Tai
2023-05-14 8:56 ` Guillaume Le Vaillant
Code repositories for project(s) associated with this public inbox https://git.savannah.gnu.org/cgit/guix.git This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).