[bug#73558] Request for merging "wip-gsl-upgrade" branch

[bug#73558] Request for merging "wip-gsl-upgrade" branch

[Ludovic Courtès]

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’.

[bug#73558] [PATCH 1/4] gnu: gsl: Add debug output.

[Ludovic Courtès]

From: Artyom Bologov <mail@aartaka.me>

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

Signed-off-by: Ludovic Courtès <ludo@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

[bug#73558] [PATCH 2/4] gnu: gsl: Build with ‘-O2 -g’ unconditionally.

[Ludovic Courtès]

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

[bug#73558] [PATCH 3/4] gnu: gsl: Update to 2.8.

[Ludovic Courtès]

* 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

[bug#73558] [PATCH 4/4] gnu: lib2geom: Update to 1.4.

[Ludovic Courtès]

* 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@gnu.org>
+;;; Copyright © 2015-2016, 2021-2022, 2024 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2015 Tomáš Čech <sleep_walker@gnu.org>
 ;;; Copyright © 2016, 2019 Leo Famulari <leo@famulari.name>
 ;;; Copyright © 2016, 2017, 2019, 2023 Ricardo Wurmus <rekado@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

[bug#73558] Request for merging "wip-gsl-upgrade" branch

[Ludovic Courtès]

Ludovic Courtès <ludo@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’.

[bug#73558] Request for merging "wip-gsl-upgrade" branch

[Ludovic Courtès]

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

> Ludovic Courtès <ludo@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’.

bug#73558: Close

[Andreas Enge]

Applied, closing the bug.

Andreas