[bug#59342] [PATCH 0/3] Update lldb.

[bug#59342] [PATCH 0/3] Update lldb.

[Greg Hogan]

With the addition of llvm 15 to Guix master, this patch set likewise
updates lldb. This update requires a newer llvm release, which includes
the bugfix in found in 58ba50a5.

https://github.com/llvm/llvm-project/commit/58ba50a52edeff3cae9cfa3bdd0ee000873ffef9

Greg Hogan (3):
  gnu: LLVM, Clang, libomp, lld: Update to 15.0.5.
  gnu: lldb: Update to 15.0.5.
  gnu: libcxx: Update to 15.0.5.

 gnu/packages/llvm.scm | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

-- 
2.38.1

[bug#59342] [PATCH 1/3] gnu: LLVM, Clang, libomp, lld: Update to 15.0.5.

[Greg Hogan]

* gnu/packages/llvm.scm (llvm-15, clang-15, libomp-15, lld-15):
Update to 15.0.5.
(lld)[version]: Use version from LLVM-15.
(%llvm-monorepo-hashes, %llvm-patches): Adjust accordingly.
---
 gnu/packages/llvm.scm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm
index de19b40343..020c9bb302 100644
--- a/gnu/packages/llvm.scm
+++ b/gnu/packages/llvm.scm
@@ -563,11 +563,11 @@ (define (make-clang-toolchain clang libomp)
 
 (define %llvm-monorepo-hashes
   '(("14.0.6" . "14f8nlvnmdkp9a9a79wv67jbmafvabczhah8rwnqrgd5g3hfxxxx")
-    ("15.0.4" . "0j5kx4s970qzcjr83kk6776zzjqfshl61x9fagqz8kjxcjbpg8cj")))
+    ("15.0.5" . "1z2szqlanksdmj91590wnxqav5z437mpasg00ghb610xkam2v34m")))
 
 (define %llvm-patches
   '(("14.0.6" . ("clang-14.0-libc-search-path.patch"))
-    ("15.0.4" . ("clang-15.0-libc-search-path.patch"))))
+    ("15.0.5" . ("clang-15.0-libc-search-path.patch"))))
 
 (define (llvm-monorepo version)
   (origin
@@ -583,7 +583,7 @@ (define (llvm-monorepo version)
 (define-public llvm-15
   (package
     (name "llvm")
-    (version "15.0.4")
+    (version "15.0.5")
     (source (llvm-monorepo version))
     (build-system cmake-build-system)
     (outputs '("out" "opt-viewer"))
@@ -740,7 +740,7 @@ (define-public clang-15
                     (package-version llvm-15)))
      (sha256
       (base32
-       "03adxlh84if9p53m6izjsql500rjza9rng8akab2pdqibgrg73rh")))))
+       "0sa6si9v7ddsa9vmg6s3918xx969rvck2v1a0g7hb0fp9jk9j4r1")))))
 
 (define-public clang-14
   (clang-from-llvm
@@ -1522,7 +1522,7 @@ (define-public libunwind-headers
 (define-public lld-15
   (package
     (name "lld")
-    (version "15.0.4")
+    (version (package-version llvm-15))
     (source (llvm-monorepo version))
     (build-system cmake-build-system)
     (inputs
-- 
2.38.1

[bug#59342] [PATCH 2/3] gnu: lldb: Update to 15.0.5.

[Greg Hogan]

* gnu/packages/llvm.scm (lldb): Update to 15.0.5.
[version]: Use version from LLVM-15.
[inputs]: Change from LLVM-14 and CLANG-14 to LLVM-15 and CLANG-15.
---
 gnu/packages/llvm.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm
index 020c9bb302..d9bbe9c078 100644
--- a/gnu/packages/llvm.scm
+++ b/gnu/packages/llvm.scm
@@ -1631,7 +1631,7 @@ (define-public lld-as-ld-wrapper
 (define-public lldb
   (package
     (name "lldb")
-    (version "14.0.6")
+    (version (package-version llvm-15))
     (source (llvm-monorepo version))
     (build-system cmake-build-system)
     (arguments
@@ -1645,8 +1645,8 @@ (define-public lldb
     (native-inputs
      (list pkg-config swig))
     (inputs
-     (list clang-14
-           llvm-14
+     (list clang-15
+           llvm-15
            ;; Optional (but recommended) inputs.
            ncurses
            libedit
-- 
2.38.1

[bug#59342] [PATCH 2/3] gnu: lldb: Update to 15.0.5.

[Christopher Baines]

[-- Attachment #1: Type: text/plain, Size: 832 bytes --]


Greg Hogan <code@greghogan.com> writes:

> * gnu/packages/llvm.scm (lldb): Update to 15.0.5.
> [version]: Use version from LLVM-15.
> [inputs]: Change from LLVM-14 and CLANG-14 to LLVM-15 and CLANG-15.
> ---
>  gnu/packages/llvm.scm | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm
> index 020c9bb302..d9bbe9c078 100644
> --- a/gnu/packages/llvm.scm
> +++ b/gnu/packages/llvm.scm
> @@ -1631,7 +1631,7 @@ (define-public lld-as-ld-wrapper
>  (define-public lldb
>    (package
>      (name "lldb")
> -    (version "14.0.6")
> +    (version (package-version llvm-15))

Hi Greg, thanks for the patches.

Looking at https://qa.guix.gnu.org/issue/59342 it seems that this
updated lldb@15.0.5 fails to build.

Do you see the same failure locally?

Thanks,

Chris

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]

[bug#59342] [PATCH 2/3] gnu: lldb: Update to 15.0.5.

[Greg Hogan]

On Sat, Nov 19, 2022 at 8:35 AM Christopher Baines <mail@cbaines.net> wrote:
>
> Greg Hogan <code@greghogan.com> writes:
>
> > * gnu/packages/llvm.scm (lldb): Update to 15.0.5.
> > [version]: Use version from LLVM-15.
> > [inputs]: Change from LLVM-14 and CLANG-14 to LLVM-15 and CLANG-15.
> > ---
> >  gnu/packages/llvm.scm | 6 +++---
> >  1 file changed, 3 insertions(+), 3 deletions(-)
> >
> > diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm
> > index 020c9bb302..d9bbe9c078 100644
> > --- a/gnu/packages/llvm.scm
> > +++ b/gnu/packages/llvm.scm
> > @@ -1631,7 +1631,7 @@ (define-public lld-as-ld-wrapper
> >  (define-public lldb
> >    (package
> >      (name "lldb")
> > -    (version "14.0.6")
> > +    (version (package-version llvm-15))
>
> Hi Greg, thanks for the patches.
>
> Looking at https://qa.guix.gnu.org/issue/59342 it seems that this
> updated lldb@15.0.5 fails to build.
>
> Do you see the same failure locally?
>
> Thanks,
>
> Chris

From my three patches I build
patch 1/3: /gnu/store/zi7pyql63j15m2ap0pf1xq4nly58pw7s-lldb-14.0.6
patch 2/3: /gnu/store/chrwzab8icp9p3mswkr6glbxba89pm6s-lldb-15.0.5
patch 3/3: /gnu/store/chrwzab8icp9p3mswkr6glbxba89pm6s-lldb-15.0.5

The data service builds lldb-15.0.4 (which errors on the missing
cmake_push_check_state fixed in 15.0.5).

Following the link from the data service, revision 7ab0095a [1] is
missing the first patch from this patchset [2]. Ideas?

[1] https://git.guix-patches.cbaines.net/guix-patches/commit/?id=7ab0095ab6f958c1c5224e8cb2155672dcea44bc
[2] https://git.guix-patches.cbaines.net/guix-patches/log/?h=issue-59342

Greg Hogan

[bug#59342] [PATCH 2/3] gnu: lldb: Update to 15.0.5.

[Christopher Baines]

[-- Attachment #1: Type: text/plain, Size: 1873 bytes --]


Greg Hogan <code@greghogan.com> writes:

> On Sat, Nov 19, 2022 at 8:35 AM Christopher Baines <mail@cbaines.net> wrote:
>>
>> Greg Hogan <code@greghogan.com> writes:
>>
>> > * gnu/packages/llvm.scm (lldb): Update to 15.0.5.
>> > [version]: Use version from LLVM-15.
>> > [inputs]: Change from LLVM-14 and CLANG-14 to LLVM-15 and CLANG-15.
>> > ---
>> >  gnu/packages/llvm.scm | 6 +++---
>> >  1 file changed, 3 insertions(+), 3 deletions(-)
>> >
>> > diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm
>> > index 020c9bb302..d9bbe9c078 100644
>> > --- a/gnu/packages/llvm.scm
>> > +++ b/gnu/packages/llvm.scm
>> > @@ -1631,7 +1631,7 @@ (define-public lld-as-ld-wrapper
>> >  (define-public lldb
>> >    (package
>> >      (name "lldb")
>> > -    (version "14.0.6")
>> > +    (version (package-version llvm-15))
>>
>> Hi Greg, thanks for the patches.
>>
>> Looking at https://qa.guix.gnu.org/issue/59342 it seems that this
>> updated lldb@15.0.5 fails to build.
>>
>> Do you see the same failure locally?
>>
>> Thanks,
>>
>> Chris
>
> From my three patches I build
> patch 1/3: /gnu/store/zi7pyql63j15m2ap0pf1xq4nly58pw7s-lldb-14.0.6
> patch 2/3: /gnu/store/chrwzab8icp9p3mswkr6glbxba89pm6s-lldb-15.0.5
> patch 3/3: /gnu/store/chrwzab8icp9p3mswkr6glbxba89pm6s-lldb-15.0.5
>
> The data service builds lldb-15.0.4 (which errors on the missing
> cmake_push_check_state fixed in 15.0.5).
>
> Following the link from the data service, revision 7ab0095a [1] is
> missing the first patch from this patchset [2]. Ideas?

Thanks for looking in to this Greg, something must have gone wrong with
the applying of the patches! I deleted the branch and it's been
re-created now, with all patches present.

Now I'm not seeing any failures, so I've gone ahead and pushed this to
master as 07746c2b153dfeacf714261f330c04d42e570f3c.

Sorry for the initial confusion!

Thanks,

Chris

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]

[bug#59342] [PATCH 3/3] gnu: libcxx: Update to 15.0.5.

[Greg Hogan]

* gnu/packages/llvm.scm (libcxx): Update to 15.0.5.
[version]: Use version from LLVM-15.
---
 gnu/packages/llvm.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm
index d9bbe9c078..b861fd9cc4 100644
--- a/gnu/packages/llvm.scm
+++ b/gnu/packages/llvm.scm
@@ -1665,7 +1665,7 @@ (define-public lldb
 (define-public libcxx
   (package
     (name "libcxx")
-    (version "14.0.6")
+    (version (package-version llvm-15))
     (source (llvm-monorepo version))
     (build-system cmake-build-system)
     (arguments
-- 
2.38.1