GNU bug report logs - #77749
[PATCH core-packages-team] gnu: diffutils: Update to 3.12.

Previous Next

Package: guix-patches;

Reported by: Andy Tai <atai <at> atai.org>

Date: Fri, 11 Apr 2025 17:20:01 UTC

Severity: normal

Tags: patch

Done: Ludovic Courtès <ludo <at> gnu.org>

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 77749 in the body.
You can then email your comments to 77749 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

View this report as an mbox folder, status mbox, maintainer mbox

Report forwarded to andreas <at> enge.fr, janneke <at> gnu.org, ludo <at> gnu.org, z572 <at> z572.online, guix-patches <at> gnu.org:
bug#77749; Package guix-patches. (Fri, 11 Apr 2025 17:20: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 andreas <at> enge.fr, janneke <at> gnu.org, ludo <at> gnu.org, z572 <at> z572.online, guix-patches <at> gnu.org. (Fri, 11 Apr 2025 17:20:01 GMT) Full text and rfc822 format available.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Andy Tai <atai <at> atai.org>
To: guix-patches <at> gnu.org,
	andreas <at> enge.fr,
	janneke <at> gnu.org,
	ludo <at> gnu.org
Cc: Andy Tai <atai <at> atai.org>
Subject: [PATCH core-packages-team] gnu: diffutils: Update to 3.12.
Date: Fri, 11 Apr 2025 10:18:34 -0700

* gnu/packages/base.scm (diffutils): Update to 3.12.

Change-Id: I246a2024cae0611098a8abb940639dcfda01d914
---
 gnu/packages/base.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 4c96ffa1a46..17b5fe99355 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -396,14 +396,14 @@ (define-public patch
 (define-public diffutils
   (package
    (name "diffutils")
-   (version "3.10")
+   (version "3.12")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://gnu/diffutils/diffutils-"
                                 version ".tar.xz"))
             (sha256
              (base32
-              "17nhkdn5a2z6pwcmjs4jas2plg066hbdz06y5vhypr14qwyfkrch"))))
+              "1zbxf8vv7z18ypddwqgzj51n426k959fiv4wxbyl34b0r2gpz2vw"))))
    (build-system gnu-build-system)
    (arguments
     (list

base-commit: 1dab24555a494beb3db5a335c675f07043e77f1c
-- 
2.43.0
Information forwarded to andreas <at> enge.fr, janneke <at> gnu.org, ludo <at> gnu.org, z572 <at> z572.online, guix-patches <at> gnu.org:
bug#77749; Package guix-patches. (Sat, 12 Apr 2025 05:32:01 GMT) Full text and rfc822 format available.

Message #8 received at 77749 <at> debbugs.gnu.org (full text, mbox):

From: Andy Tai <atai <at> atai.org>
To: 77749 <at> debbugs.gnu.org,
	andreas <at> enge.fr,
	janneke <at> gnu.org,
	ludo <at> gnu.org
Cc: Andy Tai <atai <at> atai.org>
Subject: [PATCH core-packages-team v2] gnu: diffutils: Update to 3.12.
Date: Fri, 11 Apr 2025 22:31:24 -0700

* gnu/packages/base.scm (diffutils): Update to 3.12.
[arguments]<#:configure-flags>: When cross-compiling,
add "ac_cv_func_strcasecmp=yes"
"gl_cv_func_strcasecmp_works=yes".

Change-Id: I246a2024cae0611098a8abb940639dcfda01d914
---
 gnu/packages/base.scm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 4c96ffa1a46..13f74b845d8 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -396,14 +396,14 @@ (define-public patch
 (define-public diffutils
   (package
    (name "diffutils")
-   (version "3.10")
+   (version "3.12")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://gnu/diffutils/diffutils-"
                                 version ".tar.xz"))
             (sha256
              (base32
-              "17nhkdn5a2z6pwcmjs4jas2plg066hbdz06y5vhypr14qwyfkrch"))))
+              "1zbxf8vv7z18ypddwqgzj51n426k959fiv4wxbyl34b0r2gpz2vw"))))
    (build-system gnu-build-system)
    (arguments
     (list
@@ -414,6 +414,11 @@ (define-public diffutils
                   (string=? (%current-system) "i586-gnu"))
              #~'("XFAIL_TESTS=test-year2038")
              #~'())
+     #:configure-flags
+     #~#$(if (%current-target-system)
+        ; fix for crosscompiling; on GNU system strcasecmp always works
+       #~'("ac_cv_func_strcasecmp=yes" "gl_cv_func_strcasecmp_works=yes")
+       #~'())
 
      #:phases (if (system-hurd?)
                   #~(modify-phases %standard-phases

base-commit: 1dab24555a494beb3db5a335c675f07043e77f1c
-- 
2.43.0
Information forwarded to andreas <at> enge.fr, janneke <at> gnu.org, ludo <at> gnu.org, z572 <at> z572.online, guix-patches <at> gnu.org:
bug#77749; Package guix-patches. (Sat, 12 Apr 2025 09:25:02 GMT) Full text and rfc822 format available.

Message #11 received at 77749 <at> debbugs.gnu.org (full text, mbox):

From: Andy Tai <atai <at> atai.org>
To: 77749 <at> debbugs.gnu.org,
	andreas <at> enge.fr,
	janneke <at> gnu.org,
	ludo <at> gnu.org
Cc: Andy Tai <atai <at> atai.org>
Subject: [PATCH v3] gnu: diffutils: Update to 3.12.
Date: Sat, 12 Apr 2025 02:23:53 -0700

* gnu/packages/base.scm (diffutils): Update to 3.12.
[arguments]<#:configure-flags>: When cross-compiling,
add "ac_cv_func_strcasecmp=yes"
"gl_cv_func_strcasecmp_works=yes".

Change-Id: I246a2024cae0611098a8abb940639dcfda01d914
---
 gnu/packages/base.scm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 4c96ffa1a46..13f74b845d8 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -396,14 +396,14 @@ (define-public patch
 (define-public diffutils
   (package
    (name "diffutils")
-   (version "3.10")
+   (version "3.12")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://gnu/diffutils/diffutils-"
                                 version ".tar.xz"))
             (sha256
              (base32
-              "17nhkdn5a2z6pwcmjs4jas2plg066hbdz06y5vhypr14qwyfkrch"))))
+              "1zbxf8vv7z18ypddwqgzj51n426k959fiv4wxbyl34b0r2gpz2vw"))))
    (build-system gnu-build-system)
    (arguments
     (list
@@ -414,6 +414,11 @@ (define-public diffutils
                   (string=? (%current-system) "i586-gnu"))
              #~'("XFAIL_TESTS=test-year2038")
              #~'())
+     #:configure-flags
+     #~#$(if (%current-target-system)
+        ; fix for crosscompiling; on GNU system strcasecmp always works
+       #~'("ac_cv_func_strcasecmp=yes" "gl_cv_func_strcasecmp_works=yes")
+       #~'())
 
      #:phases (if (system-hurd?)
                   #~(modify-phases %standard-phases

base-commit: 63f323fc98fb6e85c48721574aab8e54d95091e5
-- 
2.43.0
Information forwarded to guix-patches <at> gnu.org:
bug#77749; Package guix-patches. (Sat, 19 Apr 2025 20:43:09 GMT) Full text and rfc822 format available.

Message #14 received at 77749 <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Andy Tai <atai <at> atai.org>
Cc: andreas <at> enge.fr, 77749 <at> debbugs.gnu.org, janneke <at> gnu.org
Subject: Re: [PATCH v3] gnu: diffutils: Update to 3.12.
Date: Sat, 19 Apr 2025 16:29:36 +0200

Hi Andy,

Andy Tai <atai <at> atai.org> writes:

> * gnu/packages/base.scm (diffutils): Update to 3.12.
> [arguments]<#:configure-flags>: When cross-compiling,
> add "ac_cv_func_strcasecmp=yes"
> "gl_cv_func_strcasecmp_works=yes".
>
> Change-Id: I246a2024cae0611098a8abb940639dcfda01d914

[...]

> -   (version "3.10")
> +   (version "3.12")

Could you rebase on current ‘core-packages-team’, where diffutils is at
3.11?

Can you confirm that it builds for you, at least on x86_64?

> +     #:configure-flags
> +     #~#$(if (%current-target-system)
> +        ; fix for crosscompiling; on GNU system strcasecmp always works
> +       #~'("ac_cv_func_strcasecmp=yes" "gl_cv_func_strcasecmp_works=yes")
> +       #~'())

Could you explain a bit more?  Does ./configure fail to determine that
‘strcasecmp’ works when cross-compiling?

Besides, please adjust indentation here and use two semicolons for a
line comment, with a capitalized sentence.

Thanks for working on it!

Ludo’.
Information forwarded to andreas <at> enge.fr, janneke <at> gnu.org, ludo <at> gnu.org, z572 <at> z572.online, guix-patches <at> gnu.org:
bug#77749; Package guix-patches. (Mon, 21 Apr 2025 08:50:02 GMT) Full text and rfc822 format available.

Message #17 received at 77749 <at> debbugs.gnu.org (full text, mbox):

From: Andy Tai <atai <at> atai.org>
To: 77749 <at> debbugs.gnu.org,
	andreas <at> enge.fr,
	janneke <at> gnu.org,
	ludo <at> gnu.org
Cc: Andy Tai <atai <at> atai.org>
Subject: [PATCH core-packages-team v4] gnu: diffutils: Update to 3.12.
Date: Mon, 21 Apr 2025 01:49:26 -0700

* gnu/packages/base.scm (diffutils): Update to 3.12.
[arguments]<#:configure-flags>: When cross-compiling,
add "ac_cv_func_strcasecmp=yes"
"gl_cv_func_strcasecmp_works=yes".

Change-Id: Icf49303e794479a0561e894ab88427c826d56cf3
---
 gnu/packages/base.scm | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index c39ec9e93d..7187d67343 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -382,14 +382,14 @@ (define-public patch
 (define-public diffutils
   (package
    (name "diffutils")
-   (version "3.11")
+   (version "3.12")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://gnu/diffutils/diffutils-"
                                 version ".tar.xz"))
             (sha256
              (base32
-              "07hkwbws3nhxqrsvsf01h6gl2q4pcfhf8s3hv3vqbmbxwdgz0gm7"))))
+              "1zbxf8vv7z18ypddwqgzj51n426k959fiv4wxbyl34b0r2gpz2vw"))))
    (build-system gnu-build-system)
    (arguments
     (list
@@ -401,6 +401,12 @@ (define-public diffutils
              #~'("XFAIL_TESTS=test-year2038")
              #~'())
 
+     #:configure-flags
+     #~#$(if (%current-target-system)
+       ;; Fix for crosscompiling; on GNU system strcasecmp always works
+       #~'("ac_cv_func_strcasecmp=yes" "gl_cv_func_strcasecmp_works=yes")
+       #~'())
+
      #:phases (if (system-hurd?)
                   #~(modify-phases %standard-phases
                       (add-after 'unpack 'skip-tests

base-commit: d478fd3f60647a8d3cb833b1fac0b4936500c029
-- 
2.43.0
Information forwarded to guix-patches <at> gnu.org:
bug#77749; Package guix-patches. (Mon, 21 Apr 2025 14:53:02 GMT) Full text and rfc822 format available.

Message #20 received at 77749 <at> debbugs.gnu.org (full text, mbox):

From: Andy Tai <atai <at> atai.org>
To: Ludovic Courtès <ludo <at> gnu.org>
Cc: andreas <at> enge.fr, 77749 <at> debbugs.gnu.org, janneke <at> gnu.org
Subject: Re: [PATCH v3] gnu: diffutils: Update to 3.12.
Date: Mon, 21 Apr 2025 07:51:36 -0700

On Sat, Apr 19, 2025 at 1:42 PM Ludovic Courtès <ludo <at> gnu.org> wrote:

> > -   (version "3.10")
> > +   (version "3.12")
>
> Could you rebase on current ‘core-packages-team’, where diffutils is at
> 3.11?
>

v4 patch it is.

> Can you confirm that it builds for you, at least on x86_64?
>

v4 patch builds on x86-64

> > +     #:configure-flags
> > +     #~#$(if (%current-target-system)
> > +        ; fix for crosscompiling; on GNU system strcasecmp always works
> > +       #~'("ac_cv_func_strcasecmp=yes" "gl_cv_func_strcasecmp_works=yes")
> > +       #~'())
>
> Could you explain a bit more?  Does ./configure fail to determine that
> ‘strcasecmp’ works when cross-compiling?
>

Correct.
Reply sent to Ludovic Courtès <ludo <at> gnu.org>:
You have taken responsibility. (Tue, 22 Apr 2025 15:25:03 GMT) Full text and rfc822 format available.
Notification sent to Andy Tai <atai <at> atai.org>:
bug acknowledged by developer. (Tue, 22 Apr 2025 15:25:04 GMT) Full text and rfc822 format available.

Message #25 received at 77749-done <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Andy Tai <atai <at> atai.org>
Cc: andreas <at> enge.fr, 77749-done <at> debbugs.gnu.org, janneke <at> gnu.org
Subject: Re: [PATCH core-packages-team v4] gnu: diffutils: Update to 3.12.
Date: Tue, 22 Apr 2025 17:17:36 +0200

Andy Tai <atai <at> atai.org> writes:

> * gnu/packages/base.scm (diffutils): Update to 3.12.
> [arguments]<#:configure-flags>: When cross-compiling,
> add "ac_cv_func_strcasecmp=yes"
> "gl_cv_func_strcasecmp_works=yes".
>
> Change-Id: Icf49303e794479a0561e894ab88427c826d56cf3

Applied, thanks!
Information forwarded to guix-patches <at> gnu.org:
bug#77749; Package guix-patches. (Fri, 25 Apr 2025 15:46:02 GMT) Full text and rfc822 format available.

Message #28 received at 77749 <at> debbugs.gnu.org (full text, mbox):

From: Greg Hogan <code <at> greghogan.com>
To: 77749 <at> debbugs.gnu.org, ludo <at> gnu.org, atai <at> atai.org
Cc: andreas <at> enge.fr, 77749-done <at> debbugs.gnu.org, janneke <at> gnu.org
Subject: Re: bug#77749: [PATCH core-packages-team v4] gnu: diffutils: Update
 to 3.12.
Date: Fri, 25 Apr 2025 11:45:23 -0400

[Message part 1 (text/plain, inline)]
On Tue, Apr 22, 2025 at 11:25 AM Ludovic Courtès <ludo <at> gnu.org> wrote:
>
> Andy Tai <atai <at> atai.org> writes:
>
> > * gnu/packages/base.scm (diffutils): Update to 3.12.
> > [arguments]<#:configure-flags>: When cross-compiling,
> > add "ac_cv_func_strcasecmp=yes"
> > "gl_cv_func_strcasecmp_works=yes".
> >
> > Change-Id: Icf49303e794479a0561e894ab88427c826d56cf3
>
> Applied, thanks!

The update to diffutils has broken automake on the core-packages-team
branch. Logs attached.

I am building from commit e4458ee85aa11e245dd34698f0c83494a9c2b7e7.

[config.log (application/octet-stream, attachment)]
[raizz360fbwjz0a8833d4vlaf2ncr3-automake-1.17.drv.gz (application/gzip, attachment)]
Information forwarded to guix-patches <at> gnu.org:
bug#77749; Package guix-patches. (Fri, 25 Apr 2025 15:46:02 GMT) Full text and rfc822 format available.
Information forwarded to guix-patches <at> gnu.org:
bug#77749; Package guix-patches. (Fri, 25 Apr 2025 15:55:01 GMT) Full text and rfc822 format available.

Message #34 received at 77749 <at> debbugs.gnu.org (full text, mbox):

From: Z572 <z572 <at> z572.online>
To: Greg Hogan <code <at> greghogan.com>
Cc: 77749 <at> debbugs.gnu.org, ludo <at> gnu.org, andreas <at> enge.fr,
 77749-done <at> debbugs.gnu.org, atai <at> atai.org, janneke <at> gnu.org
Subject: Re: [bug#77749] [PATCH core-packages-team v4] gnu: diffutils:
 Update to 3.12.
Date: Fri, 25 Apr 2025 23:54:10 +0800

[Message part 1 (text/plain, inline)]
Greg Hogan <code <at> greghogan.com> writes:

> On Tue, Apr 22, 2025 at 11:25 AM Ludovic Courtès <ludo <at> gnu.org> wrote:
>>
>> Andy Tai <atai <at> atai.org> writes:
>>
>> > * gnu/packages/base.scm (diffutils): Update to 3.12.
>> > [arguments]<#:configure-flags>: When cross-compiling,
>> > add "ac_cv_func_strcasecmp=yes"
>> > "gl_cv_func_strcasecmp_works=yes".
>> >
>> > Change-Id: Icf49303e794479a0561e894ab88427c826d56cf3
>>
>> Applied, thanks!
>
> The update to diffutils has broken automake on the core-packages-team
> branch. Logs attached.
>
> I am building from commit e4458ee85aa11e245dd34698f0c83494a9c2b7e7.
>
> [2. application/octet-stream; config.log]...
>
> [3. application/gzip; raizz360fbwjz0a8833d4vlaf2ncr3-automake-1.17.drv.gz]...

These tests seem unstable and sometimes succeed, maybe we should disable
these tests.



[signature.asc (application/pgp-signature, inline)]
Information forwarded to guix-patches <at> gnu.org:
bug#77749; Package guix-patches. (Fri, 25 Apr 2025 15:55:02 GMT) Full text and rfc822 format available.
bug archived. Request was from Debbugs Internal Request <help-debbugs <at> gnu.org> to internal_control <at> debbugs.gnu.org. (Sat, 24 May 2025 11:24:08 GMT) Full text and rfc822 format available.
This bug report was last modified today.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.