GNU bug report logs -
#63456
mesa build failure at guix package -u
Previous Next
Reported by: Andy Tai <atai <at> atai.org>
Date: Fri, 12 May 2023 06:19:01 UTC
Severity: normal
Done: Guillaume Le Vaillant <glv <at> posteo.net>
Bug is archived. No further changes may be made.
To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 63456 in the body.
You can then email your comments to 63456 AT debbugs.gnu.org in the normal way.
Toggle the display of automated, internal messages from the tracker.
Report forwarded
to
bug-guix <at> gnu.org
:
bug#63456
; Package
guix
.
(Fri, 12 May 2023 06:19:01 GMT)
Full text and
rfc822 format available.
Acknowledgement sent
to
Andy Tai <atai <at> atai.org>
:
New bug report received and forwarded. Copy sent to
bug-guix <at> gnu.org
.
(Fri, 12 May 2023 06:19:02 GMT)
Full text and
rfc822 format available.
Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
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
Information forwarded
to
bug-guix <at> gnu.org
:
bug#63456
; Package
guix
.
(Fri, 12 May 2023 06:33:01 GMT)
Full text and
rfc822 format available.
Message #8 received at 63456 <at> debbugs.gnu.org (full text, mbox):
the actual package failing to build is mesa-opencl, not mesa itself
Information forwarded
to
bug-guix <at> gnu.org
:
bug#63456
; Package
guix
.
(Fri, 12 May 2023 06:51:02 GMT)
Full text and
rfc822 format available.
Message #11 received at 63456 <at> debbugs.gnu.org (full text, mbox):
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 <at> 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
Information forwarded
to
bug-guix <at> gnu.org
:
bug#63456
; Package
guix
.
(Sat, 13 May 2023 05:10:02 GMT)
Full text and
rfc822 format available.
Information forwarded
to
bug-guix <at> gnu.org
:
bug#63456
; Package
guix
.
(Sat, 13 May 2023 05:11:02 GMT)
Full text and
rfc822 format available.
Added blocking bug(s) 63479
Request was from
Andy Tai <atai <at> atai.org>
to
control <at> debbugs.gnu.org
.
(Sat, 13 May 2023 05:14:02 GMT)
Full text and
rfc822 format available.
Reply sent
to
Guillaume Le Vaillant <glv <at> posteo.net>
:
You have taken responsibility.
(Sun, 14 May 2023 08:58:01 GMT)
Full text and
rfc822 format available.
Notification sent
to
Andy Tai <atai <at> atai.org>
:
bug acknowledged by developer.
(Sun, 14 May 2023 08:58:01 GMT)
Full text and
rfc822 format available.
Message #24 received at 63456-done <at> debbugs.gnu.org (full text, mbox):
[Message part 1 (text/plain, inline)]
Patch pushed as 930e6e3e7a1c5f83aedb49f6fa0ebb0e0bdeeef3.
Thanks.
[signature.asc (application/pgp-signature, inline)]
bug archived.
Request was from
Debbugs Internal Request <help-debbugs <at> gnu.org>
to
internal_control <at> debbugs.gnu.org
.
(Sun, 11 Jun 2023 11:24:09 GMT)
Full text and
rfc822 format available.
This bug report was last modified 290 days ago.
Previous Next
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.