Skip to content

Commit

Permalink
package/gsl: fix musl build on m68k
Browse files Browse the repository at this point in the history
Update patch to fix the following musl build failure with m68k which is
only raised (for an unknown reason) since bump to version 2.7.1 in commit
3e48f83:

In file included from fp.c:6:
fp-gnum68k.c:21:10: fatal error: fpu_control.h: No such file or directory
   21 | #include <fpu_control.h>
      |          ^~~~~~~~~~~~~~~

Add also upstream link to first patch iteration which was sent in
November 2022 but didn't get it any reply (like most of the other emails
sent to [email protected] ...)

Fixes:
 - http://autobuild.buildroot.org/results/e59636f6ac148807c1c67f09eef0e0a9f5d52303

Signed-off-by: Fabrice Fontaine <[email protected]>
Signed-off-by: Peter Korsgaard <[email protected]>
  • Loading branch information
ffontaine authored and jacmet committed Nov 29, 2023
1 parent 273b634 commit 02e80e0
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
1 change: 0 additions & 1 deletion .checkpackageignore
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,6 @@ package/graphite2/0001-don-t-install-a-libtool-file-with-static-library.patch Up
package/grpc/0002-wrap_memcpy.cc-add-GPR_DISABLE_WRAPPED_MEMCPY.patch Upstream
package/grpc/0003-host-grpc-only-cpp-plugin.patch Upstream
package/grpc/0004-disable-unconditionally-downloading-api-repos.patch Upstream
package/gsl/0001-configure.ac-fix-build-on-powerpc.patch Upstream
package/gstreamer1/gstd/0001-Don-t-require-gstd-check-user-xenv.sh-for-systemd-se.patch Upstream
package/guile/0001-calculate-csqrt_manually.patch Upstream
package/guile/0002-Makefile.am-fix-build-without-makeinfo.patch Upstream
Expand Down
7 changes: 4 additions & 3 deletions package/gsl/0001-configure.ac-fix-build-on-powerpc.patch
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
From 84e62d57b90b41a0c96bb9fb6ec61ecaac76a1ab Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <[email protected]>
Date: Sat, 5 Nov 2022 21:31:36 +0100
Subject: [PATCH] configure.ac: fix build on powerpc
Subject: [PATCH] configure.ac: fix build on powerpc and m68k

Fix the following powerpc build failures on:
Fix the following powerpc and m68k build failures on:
- musl raised because fpu_control.h is not available:

In file included from fp.c:8:
Expand All @@ -25,6 +25,7 @@ Fixes:
- http://autobuild.buildroot.org/results/48403946bb4cda9013e51db59c1b2ffdcf4e2854

Signed-off-by: Fabrice Fontaine <[email protected]>
Upstream: https://lists.gnu.org/archive/html/bug-gsl/2022-11/msg00000.html
---
configure.ac | 8 ++++++++
1 file changed, 8 insertions(+)
Expand All @@ -37,7 +38,7 @@ index bfd9ca30..1ee6dca0 100644
fi
fi

+if test "$ac_cv_c_ieee_interface" = "gnuppc" ; then
+if test "$ac_cv_c_ieee_interface" = "gnuppc" -o "$ac_cv_c_ieee_interface" = "gnum68k" ; then
+ AC_CACHE_CHECK([for _FPU_RC_NEAREST], ac_cv_c__fpu_rc_nearest,
+ [ac_cv_c__fpu_rc_nearest=no
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <fpu_control.h>
Expand Down

0 comments on commit 02e80e0

Please sign in to comment.