[bug#53431,1/3] gnu: i2c-tools: Update to 4.3.

* gnu/packages/linux.scm (i2c-tools): Update to 4.3.
  [arguments]: Up case "prefix" make-flag and add "LDFLAGS".
  (i2c-tools-3): New variable.
* gnu/packages/admin.scm (novena-eeprom)[inputs]: Replace "i2c-tools" by
  "i2c-tools-3".
---
 gnu/packages/admin.scm |  2 +-
 gnu/packages/linux.scm | 33 +++++++++++++++++++++++++++------
 2 files changed, 28 insertions(+), 7 deletions(-)

Hello Brice!

Brice Waegeneire <brice@waegenei.re> writes:

> * gnu/packages/linux.scm (i2c-tools): Update to 4.3.
>   [arguments]: Up case "prefix" make-flag and add "LDFLAGS".
                        ^ the         ^ make flag

[...]

> @@ -4430,21 +4430,22 @@ (define-public iucode-tool
>  (define-public i2c-tools
>    (package
>      (name "i2c-tools")
> -    (version "3.1.1")
> +    (version "4.3")
>      (source (origin
>                (method url-fetch)
>                (uri (string-append
>                      "http://jdelvare.nerim.net/mirror/i2c-tools/i2c-tools-"
> -                    version ".tar.bz2"))
> +                    version ".tar.xz"))
>                (sha256
>                 (base32
> -                "000pvg995qy1b15ks59gd0klri55hb33kqpg5czy84hw1pbdgm0l"))))
> +                "1y0fphjd5ah2j886x8i175r7viq0hmx666hyca0wi4dzrm290qxk"))))
>      (build-system gnu-build-system)
>      (arguments
>       `(#:tests? #f                      ; no 'check' target
>         #:make-flags
> -       ,#~(list (string-append "prefix=" #$output)
> -                (string-append "CC=" #$(cc-for-target)))
> +       ,#~(list (string-append "PREFIX=" #$output)
> +                (string-append "CC=" #$(cc-for-target))
> +                (string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib"))

Why is this ld directive needed?  They don't use it in Nix, for
instance.  A comment would be helpful.

>         ;; No configure script.
>         #:phases (modify-phases %standard-phases (delete 'configure))))
>      (inputs
> @@ -4458,6 +4459,26 @@ (define-public i2c-tools
>  SMBus access.")
>      (license license:gpl2+)))

Looking at the Nix package definition, they do some other things that we
don't have, which we perhaps should:

--8<---------------cut here---------------start------------->8---
  postPatch = ''
    substituteInPlace eeprom/decode-edid \
      --replace "/usr/sbin/parse-edid" "${read-edid}/bin/parse-edid"

    substituteInPlace stub/i2c-stub-from-dump \
      --replace "/sbin/" ""
;--8<---------------cut here---------------end--------------->8---

They patch a reference to parse-edid and strip the '/sbin/' prefix from
some other place.

> +;; Needed for novena-eeprom
                              ^. (ending period)
> +(define-public i2c-tools-3
> +  (package
> +    (inherit i2c-tools)
> +    (version "3.1.1")
> +    (source (origin
> +              (method url-fetch)
> +              (uri (string-append
> +                    "http://jdelvare.nerim.net/mirror/i2c-tools/i2c-tools-"
> +                    version ".tar.bz2"))
> +              (sha256
> +               (base32
> +                "000pvg995qy1b15ks59gd0klri55hb33kqpg5czy84hw1pbdgm0l"))))
> +    (arguments
> +     `(#:make-flags
> +       ,#~(list (string-append "prefix=" #$output)
> +                (string-append "CC=" #$(cc-for-target)))
> +       ,@(strip-keyword-arguments '(#:make-flags)
> +                                  (package-arguments i2c-tools))))))
> +
>  (define-public xsensors
>    (package
>      (name "xsensors")

The rest LGTM!

Thanks,

Maxim

Hi Brice,

Did you have a chance to look into this for a v2?

  https://issues.guix.gnu.org/53431

Ludo’.

Maxim Cournoyer <maxim.cournoyer@gmail.com> skribis:

> Hello Brice!
>
> Brice Waegeneire <brice@waegenei.re> writes:
>
>> * gnu/packages/linux.scm (i2c-tools): Update to 4.3.
>>   [arguments]: Up case "prefix" make-flag and add "LDFLAGS".
>                         ^ the         ^ make flag
>
> [...]
>
>> @@ -4430,21 +4430,22 @@ (define-public iucode-tool
>>  (define-public i2c-tools
>>    (package
>>      (name "i2c-tools")
>> -    (version "3.1.1")
>> +    (version "4.3")
>>      (source (origin
>>                (method url-fetch)
>>                (uri (string-append
>>                      "http://jdelvare.nerim.net/mirror/i2c-tools/i2c-tools-"
>> -                    version ".tar.bz2"))
>> +                    version ".tar.xz"))
>>                (sha256
>>                 (base32
>> -                "000pvg995qy1b15ks59gd0klri55hb33kqpg5czy84hw1pbdgm0l"))))
>> +                "1y0fphjd5ah2j886x8i175r7viq0hmx666hyca0wi4dzrm290qxk"))))
>>      (build-system gnu-build-system)
>>      (arguments
>>       `(#:tests? #f                      ; no 'check' target
>>         #:make-flags
>> -       ,#~(list (string-append "prefix=" #$output)
>> -                (string-append "CC=" #$(cc-for-target)))
>> +       ,#~(list (string-append "PREFIX=" #$output)
>> +                (string-append "CC=" #$(cc-for-target))
>> +                (string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib"))
>
> Why is this ld directive needed?  They don't use it in Nix, for
> instance.  A comment would be helpful.
>
>>         ;; No configure script.
>>         #:phases (modify-phases %standard-phases (delete 'configure))))
>>      (inputs
>> @@ -4458,6 +4459,26 @@ (define-public i2c-tools
>>  SMBus access.")
>>      (license license:gpl2+)))
>
> Looking at the Nix package definition, they do some other things that we
> don't have, which we perhaps should:
>
> --8<---------------cut here---------------start------------->8---
>   postPatch = ''
>     substituteInPlace eeprom/decode-edid \
>       --replace "/usr/sbin/parse-edid" "${read-edid}/bin/parse-edid"
>
>     substituteInPlace stub/i2c-stub-from-dump \
>       --replace "/sbin/" ""
> ;--8<---------------cut here---------------end--------------->8---
>
> They patch a reference to parse-edid and strip the '/sbin/' prefix from
> some other place.
>
>> +;; Needed for novena-eeprom
>                               ^. (ending period)
>> +(define-public i2c-tools-3
>> +  (package
>> +    (inherit i2c-tools)
>> +    (version "3.1.1")
>> +    (source (origin
>> +              (method url-fetch)
>> +              (uri (string-append
>> +                    "http://jdelvare.nerim.net/mirror/i2c-tools/i2c-tools-"
>> +                    version ".tar.bz2"))
>> +              (sha256
>> +               (base32
>> +                "000pvg995qy1b15ks59gd0klri55hb33kqpg5czy84hw1pbdgm0l"))))
>> +    (arguments
>> +     `(#:make-flags
>> +       ,#~(list (string-append "prefix=" #$output)
>> +                (string-append "CC=" #$(cc-for-target)))
>> +       ,@(strip-keyword-arguments '(#:make-flags)
>> +                                  (package-arguments i2c-tools))))))
>> +
>>  (define-public xsensors
>>    (package
>>      (name "xsensors")
>
> The rest LGTM!
>
> Thanks,
>
> Maxim

Ludovic Courtès <ludo@gnu.org> writes:

> Hi Brice,
>
> Did you have a chance to look into this for a v2?
>
>   https://issues.guix.gnu.org/53431

I see all components here are now at version past what was sent here,
thus I'm closing this ticket.

Thanks,

Maxim