[bug#72451] [PATCH core-updates] gnu: gsl: Fix build on i686.

[bug#72451] [PATCH core-updates] gnu: gsl: Fix build on i686.

[Kaelyn Takata via Guix-patches via]

* gnu/packages/maths.scm (gsl)[arguments]<#:make-flags>: Include the default
CFLAGS, restoring the optimized build and fixing test failures on i686.

Change-Id: I64a43368b000995e03810b33de131aba4203d02b
---
 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 c06eddcc34..984aa35066 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -729,7 +729,7 @@ (define-public gsl
     (build-system gnu-build-system)
     (arguments
      (let ((system (%current-system)))
-       `(#:make-flags (list "CFLAGS=-fPIC")
+       `(#:make-flags (list "CFLAGS=-g -O2 -fPIC")
          #:phases
          (modify-phases %standard-phases
            ,@(cond

base-commit: baad95b19a24401cad8bee7290e5dbf3b3f38287
--
2.45.2

[bug#72451] fixing the gsl test failures on i686

[Kaelyn via Guix-patches via]

Hi Ludo,

I noticed this morning that you recently pushed commit fa8dbbe59d to fix the i686-linux gsl test failures. I'd submitted a similar fix about two weeks ago (along with a couple of other i686-linux fixes that affect building wine64), and I wanted to mention that I don't think your commit does the right thing with CFLAGS. When I figured out the error, I noticed a side-effect of passing CFLAGS=-fPIC as the #:make-flags is that it disables the optimized build (or at least relies on whatever optimizations the compiler defaults to, which AFAIK is little to none). While your patch also cleans up the definition a bit by no longer disabling some tests, I think the correct approach is to include the package's default CFLAGS as part of the #:make-flags as I did in issue 72451 so that optimizations aren't unintentionally disabled.

Cheers,
Kaelyn

[bug#72451] fixing the gsl test failures on i686

[Ludovic Courtès]

Hi Kaelyn,

Kaelyn <kaelyn.alexi@protonmail.com> skribis:

> I noticed this morning that you recently pushed commit fa8dbbe59d to fix the i686-linux gsl test failures. I'd submitted a similar fix about two weeks ago (along with a couple of other i686-linux fixes that affect building wine64), and I wanted to mention that I don't think your commit does the right thing with CFLAGS. When I figured out the error, I noticed a side-effect of passing CFLAGS=-fPIC as the #:make-flags is that it disables the optimized build (or at least relies on whatever optimizations the compiler defaults to, which AFAIK is little to none). While your patch also cleans up the definition a bit by no longer disabling some tests, I think the correct approach is to include the package's default CFLAGS as part of the #:make-flags as I did in issue 72451 so that optimizations aren't unintentionally disabled.

Oh, apologies for not noticing <https://issues.guix.gnu.org/72451>.

What you did looks correct to me.  I added a FIXME about ‘CFLAGS=-fPIC’
stating roughly what you explained here.

The reason I did not change CFLAGS on other architectures was to avoid a
massive rebuild at this late stage of the branch (‘gsl’ has 2.9K
dependents).

But I agree: we should clean that up for all platforms, and check which
of the tests really need to be skipped on 32-bit platforms once compiled
with optimizations.  We can create a branch with such a patch once
‘core-updates’ is merged.

WDYT?

Thanks,
Ludo’.