Re: 01/03: gnu: lld-as-ld-wrapper: Add version 15.

Re: 01/03: gnu: lld-as-ld-wrapper: Add version 15.

[Christopher Baines]

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


guix-commits@gnu.org writes:

> mbakke pushed a commit to branch master
> in repository guix.
>
> commit 65976a8382678cd983ceddde040b777cba1f1be9
> Author: Marius Bakke <marius@gnu.org>
> AuthorDate: Thu Nov 17 07:22:41 2022 +0100
>
>     gnu: lld-as-ld-wrapper: Add version 15.
>
>     * gnu/packages/llvm.scm (lld-as-ld-wrapper-15): New variable.
> ---
>  gnu/packages/llvm.scm | 3 +++
>  1 file changed, 3 insertions(+)
>
> diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm
> index de19b40343..2b50b127c2 100644
> --- a/gnu/packages/llvm.scm
> +++ b/gnu/packages/llvm.scm
> @@ -1625,6 +1625,9 @@ misuse of libraries outside of the store.")
>    (make-lld-wrapper lld))
>
>  ;;; A LLD wrapper that can be used as a (near) drop-in replacement to GNU ld.
> +(define-public lld-as-ld-wrapper-15
> +  (make-lld-wrapper lld-15 #:lld-as-ld? #t))
> +
>  (define-public lld-as-ld-wrapper
>    (make-lld-wrapper lld #:lld-as-ld? #t))

I spotted this change when looking at [1] as the Guix Data Service is
failing at extracting a consistent derivation for lld-as-ld-wrapper@0.

1: https://qa.guix.gnu.org/issue/59367

Maybe that could be viewed as a bug in the Guix Data Service, as it
assumes/wants packages to be unique by name and version (at least the
public/visible packages).

But this is something raised by the linter also:

  → ./pre-inst-env guix lint lld-as-ld-wrapper
  guix lint: warning: ambiguous package specification `lld-as-ld-wrapper'
  guix lint: warning: choosing lld-as-ld-wrapper@0 from gnu/packages/llvm.scm:1594:2

Is there something that can be done about this, perhaps by using the lld
package version in the name or version for this package, or by hiding
this package?

Thanks,

Chris

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

Re: 01/03: gnu: lld-as-ld-wrapper: Add version 15.

[Marius Bakke]

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

Christopher Baines <mail@cbaines.net> skriver:

> guix-commits@gnu.org writes:
>
>> mbakke pushed a commit to branch master
>> in repository guix.
>>
>> commit 65976a8382678cd983ceddde040b777cba1f1be9
>> Author: Marius Bakke <marius@gnu.org>
>> AuthorDate: Thu Nov 17 07:22:41 2022 +0100
>>
>>     gnu: lld-as-ld-wrapper: Add version 15.
>>
>>     * gnu/packages/llvm.scm (lld-as-ld-wrapper-15): New variable.
>> ---
>>  gnu/packages/llvm.scm | 3 +++
>>  1 file changed, 3 insertions(+)
>>
>> diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm
>> index de19b40343..2b50b127c2 100644
>> --- a/gnu/packages/llvm.scm
>> +++ b/gnu/packages/llvm.scm
>> @@ -1625,6 +1625,9 @@ misuse of libraries outside of the store.")
>>    (make-lld-wrapper lld))
>>
>>  ;;; A LLD wrapper that can be used as a (near) drop-in replacement to GNU ld.
>> +(define-public lld-as-ld-wrapper-15
>> +  (make-lld-wrapper lld-15 #:lld-as-ld? #t))
>> +
>>  (define-public lld-as-ld-wrapper
>>    (make-lld-wrapper lld #:lld-as-ld? #t))
>
> I spotted this change when looking at [1] as the Guix Data Service is
> failing at extracting a consistent derivation for lld-as-ld-wrapper@0.
>
> 1: https://qa.guix.gnu.org/issue/59367
>
> Maybe that could be viewed as a bug in the Guix Data Service, as it
> assumes/wants packages to be unique by name and version (at least the
> public/visible packages).
>
> But this is something raised by the linter also:
>
>   → ./pre-inst-env guix lint lld-as-ld-wrapper
>   guix lint: warning: ambiguous package specification `lld-as-ld-wrapper'
>   guix lint: warning: choosing lld-as-ld-wrapper@0 from gnu/packages/llvm.scm:1594:2
>
> Is there something that can be done about this, perhaps by using the lld
> package version in the name or version for this package, or by hiding
> this package?

I think using the LLD version is sensible.  I made this change in
cd9161372aa3ec9b8902385d5937d04e1868495c and also inherited the
home-page and license fields.

Maxim: please let me know if you this this was misguided!

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

Re: 01/03: gnu: lld-as-ld-wrapper: Add version 15.

[Maxim Cournoyer]

Hi,

Marius Bakke <marius@gnu.org> writes:

> Christopher Baines <mail@cbaines.net> skriver:

[...]

>> I spotted this change when looking at [1] as the Guix Data Service is
>> failing at extracting a consistent derivation for lld-as-ld-wrapper@0.
>>
>> 1: https://qa.guix.gnu.org/issue/59367
>>
>> Maybe that could be viewed as a bug in the Guix Data Service, as it
>> assumes/wants packages to be unique by name and version (at least the
>> public/visible packages).
>>
>> But this is something raised by the linter also:
>>
>>   → ./pre-inst-env guix lint lld-as-ld-wrapper
>>   guix lint: warning: ambiguous package specification `lld-as-ld-wrapper'
>>   guix lint: warning: choosing lld-as-ld-wrapper@0 from gnu/packages/llvm.scm:1594:2
>>
>> Is there something that can be done about this, perhaps by using the lld
>> package version in the name or version for this package, or by hiding
>> this package?
>
> I think using the LLD version is sensible.  I made this change in
> cd9161372aa3ec9b8902385d5937d04e1868495c and also inherited the
> home-page and license fields.
>
> Maxim: please let me know if you this this was misguided!

No, it looks reasonable to me :-).

-- 
Thanks,
Maxim

Re: 01/03: gnu: lld-as-ld-wrapper: Add version 15.

[Ludovic Courtès]

Hi,

Marius Bakke <marius@gnu.org> skribis:

> I think using the LLD version is sensible.  I made this change in
> cd9161372aa3ec9b8902385d5937d04e1868495c and also inherited the
> home-page and license fields.

Thanks!

I’d like to point out that duplicate packages (same name and same
version) lead to the failure of the test called "fold-available-packages
with/without cache" in ‘tests/packages.scm’, so that also fixed that.
:-)

Ludo’.