GNU bug report logs - #73558
Request for merging "wip-gsl-upgrade" branch

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 73558 in the body.
You can then email your comments to 73558 AT debbugs.gnu.org in the normal way.

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

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

From: Ludovic Courtès <ludo <at> gnu.org>
To: guix-patches <at> gnu.org
Subject: Request for merging "wip-gsl-upgrade" branch
Date: Sun, 29 Sep 2024 22:32:30 +0200

Hello,

I’d like to merge the ‘wip-gsl-upgrade’ branch, with the following
patches:

  a42a779e76 gnu: lib2geom: Update to 1.4.
  dcc666e15a gnu: gsl: Update to 2.8.
  85a2d861d8 gnu: gsl: Build with ‘-O2 -g’ unconditionally.
  db4c0559ec gnu: gsl: Add debug output.

Note that lib2geom is not strictly speaking related to gsl, but it’s a
dependent of gsl and in need of an update, too.

Ludo’.

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

From: Ludovic Courtès <ludo <at> gnu.org>
To: 73558 <at> debbugs.gnu.org
Cc: Ludovic Courtès <ludo <at> gnu.org>,
 Artyom Bologov <mail <at> aartaka.me>
Subject: [PATCH 1/4] gnu: gsl: Add debug output.
Date: Sun, 29 Sep 2024 22:36:40 +0200

From: Artyom Bologov <mail <at> aartaka.me>

* gnu/packages/maths.scm (gsl)[outputs]: Add "debug".

Signed-off-by: Ludovic Courtès <ludo <at> gnu.org>
---
 gnu/packages/maths.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 5f47d5e390..9032b5268a 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -725,7 +725,7 @@ (define-public gsl
               (sha256
                (base32
                 "0jxkxrnpys2j3rh8bzx0bmnh4w6xm28jd57rgxsjp0s863agpc6w"))))
-    (outputs '("out" "static"))
+    (outputs '("out" "static" "debug"))
     (build-system gnu-build-system)
     (arguments
      (list ;; FIXME: Setting CFLAGS=-fPIC is not only unnecessary, it's also

base-commit: e464a3e166b826a040aea7140ee33f3e89da6a88
-- 
2.46.0

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

From: Ludovic Courtès <ludo <at> gnu.org>
To: 73558 <at> debbugs.gnu.org
Cc: Ludovic Courtès <ludo <at> gnu.org>
Subject: [PATCH 2/4] gnu: gsl: Build with ‘-O2 -g’ unconditionally.
Date: Sun, 29 Sep 2024 22:36:41 +0200

Fixes a regression introduced in
53bec65c51c3f2b7e318db4dc7a5c3a09ad00214 that would cause gsl to be
built without optimizations and without debugging symbols (equivalent to
“-O0 -g0”).

* gnu/packages/maths.scm (gsl)[arguments]: Remove #:make-flags.

Change-Id: I5297e3602bffbb7655d655622cc3d7595f82b25a
---
 gnu/packages/maths.scm | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 9032b5268a..d318dc3d0b 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -728,17 +728,7 @@ (define-public gsl
     (outputs '("out" "static" "debug"))
     (build-system gnu-build-system)
     (arguments
-     (list ;; FIXME: Setting CFLAGS=-fPIC is not only unnecessary, it's also
-           ;; harmful because it removes the default '-O2 -g', meaning that the
-           ;; library ends up being compiled as -O0.  Consequently, some
-           ;; numerical tests fail, notably on i686-linux.  TODO: Remove
-           ;; 'CFLAGS=-fPIC' for all systems and revisit or remove
-           ;; 'disable-failing-tests' phases accordingly.
-           #:make-flags (if (and (not (%current-target-system))
-                                 (string=? (%current-system) "i686-linux"))
-                            #~'()
-                            #~(list "CFLAGS=-fPIC"))
-           #:phases
+     (list #:phases
            #~(modify-phases %standard-phases
                #$@(cond
                    ((and (target-riscv64?)
-- 
2.46.0

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

From: Ludovic Courtès <ludo <at> gnu.org>
To: 73558 <at> debbugs.gnu.org
Cc: Ludovic Courtès <ludo <at> gnu.org>
Subject: [PATCH 3/4] gnu: gsl: Update to 2.8.
Date: Sun, 29 Sep 2024 22:36:42 +0200

* gnu/packages/maths.scm (gsl): Update to 2.8.

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

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index d318dc3d0b..33d55a35b0 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -717,14 +717,14 @@ (define-public dsfmt
 (define-public gsl
   (package
     (name "gsl")
-    (version "2.7.1")
+    (version "2.8")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnu/gsl/gsl-"
                                   version ".tar.gz"))
               (sha256
                (base32
-                "0jxkxrnpys2j3rh8bzx0bmnh4w6xm28jd57rgxsjp0s863agpc6w"))))
+                "141i8ag2qazyqqk17bfr2l7mr1asxm1da7avi5a66b332pnyx6ba"))))
     (outputs '("out" "static" "debug"))
     (build-system gnu-build-system)
     (arguments
-- 
2.46.0

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

From: Ludovic Courtès <ludo <at> gnu.org>
To: 73558 <at> debbugs.gnu.org
Cc: Ludovic Courtès <ludo <at> gnu.org>
Subject: [PATCH 4/4] gnu: lib2geom: Update to 1.4.
Date: Sun, 29 Sep 2024 22:36:43 +0200

* gnu/packages/graphics.scm (lib2geom): Update to 1.4.
[arguments]: In ‘skip-faulty-test’ phase, add two tests.

Change-Id: I14fed9225a8f27174f67fecc231ab44dd10bcf10
---
 gnu/packages/graphics.scm | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index 7ed5cdc92d..f0dc30e323 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2015, 2016, 2021, 2022 Ludovic Courtès <ludo <at> gnu.org>
+;;; Copyright © 2015-2016, 2021-2022, 2024 Ludovic Courtès <ludo <at> gnu.org>
 ;;; Copyright © 2015 Tomáš Čech <sleep_walker <at> gnu.org>
 ;;; Copyright © 2016, 2019 Leo Famulari <leo <at> famulari.name>
 ;;; Copyright © 2016, 2017, 2019, 2023 Ricardo Wurmus <rekado <at> elephly.net>
@@ -912,7 +912,7 @@ (define-public ilmbase
 (define-public lib2geom
   (package
     (name "lib2geom")
-    (version "1.3")
+    (version "1.4")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -921,7 +921,7 @@ (define-public lib2geom
               (file-name (git-file-name "lib2geom" version))
               (sha256
                (base32
-                "1ypcn0yxk9ny7qg8s8h3px2wpimhfgkwk7x1548ky12iqmdjjmcn"))))
+                "0gfgzwm5s50caj5s6l7irgmlifpmypd0fnm6ckzli1fdziwjgdwi"))))
     (build-system cmake-build-system)
     (arguments
      (list
@@ -961,7 +961,9 @@ (define-public lib2geom
 
                         ;; XXX: Additional unresolved test failures.
                         (("elliptical-arc-test") "")
-                        (("self-intersections-test") ""))))))
+                        (("self-intersections-test") "")
+                        (("polynomial-test") "")
+                        (("line-test") ""))))))
               ;; See https://gitlab.com/inkscape/lib2geom/-/issues/63
               ((or (target-aarch64?)
                    (target-riscv64?))
-- 
2.46.0

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

From: Ludovic Courtès <ludo <at> gnu.org>
To: 73558 <at> debbugs.gnu.org
Subject: Re: bug#73558: Request for merging "wip-gsl-upgrade" branch
Date: Sun, 29 Sep 2024 22:56:40 +0200

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

> I’d like to merge the ‘wip-gsl-upgrade’ branch, with the following
> patches:
>
>   a42a779e76 gnu: lib2geom: Update to 1.4.
>   dcc666e15a gnu: gsl: Update to 2.8.
>   85a2d861d8 gnu: gsl: Build with ‘-O2 -g’ unconditionally.
>   db4c0559ec gnu: gsl: Add debug output.

This is being built here:

  https://ci.guix.gnu.org/jobset/gsl-upgrade

Ludo’.

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

From: Ludovic Courtès <ludo <at> gnu.org>
To: 73558 <at> debbugs.gnu.org
Subject: Re: bug#73558: Request for merging "wip-gsl-upgrade" branch
Date: Wed, 02 Oct 2024 18:55:34 +0200

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

> Ludovic Courtès <ludo <at> gnu.org> skribis:
>
>> I’d like to merge the ‘wip-gsl-upgrade’ branch, with the following
>> patches:
>>
>>   a42a779e76 gnu: lib2geom: Update to 1.4.
>>   dcc666e15a gnu: gsl: Update to 2.8.
>>   85a2d861d8 gnu: gsl: Build with ‘-O2 -g’ unconditionally.
>>   db4c0559ec gnu: gsl: Add debug output.
>
> This is being built here:
>
>   https://ci.guix.gnu.org/jobset/gsl-upgrade

I gave up on the lib2geom upgrade because its only direct dependent,
Inkscape, fails to build with it (I guess we’d need to upgrade Inkscape
as well but I didn’t feel like doing that).

Apart from that, it looks good!

Ludo’.

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

From: Andreas Enge <andreas <at> enge.fr>
To: 73971-done <at> debbugs.gnu.org, 73558-done <at> debbugs.gnu.org
Cc: ludo <at> gnu.org
Subject: Close
Date: Tue, 3 Dec 2024 10:49:41 +0100

Applied, closing the bug.

Andreas

Previous Next

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