[pkgsrc/trunk]: pkgsrc/emulators/free42 emulators/free42: explicitly include ...

[dbj <dbj%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2c7f5b9ccc94
branches:  trunk
changeset: 382082:2c7f5b9ccc94
user:      dbj <dbj%pkgsrc.org@localhost>
date:      Wed Jul 20 05:03:06 2022 +0000

description:
emulators/free42: explicitly include fenv.h on platforms that use it

second attempt to fix NetBSD build breakage
thanks @gdt for pointing out that fenv.h wasn't being included when expected

diffstat:

 emulators/free42/distinfo                             |   4 ++--
 emulators/free42/patches/patch-gtk_build-intel-lib.sh |  12 ++++++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

diffs (46 lines):

diff -r 8b1541ee8baa -r 2c7f5b9ccc94 emulators/free42/distinfo
--- a/emulators/free42/distinfo Wed Jul 20 02:16:49 2022 +0000
+++ b/emulators/free42/distinfo Wed Jul 20 05:03:06 2022 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.7 2022/07/19 08:49:43 dbj Exp $
+$NetBSD: distinfo,v 1.8 2022/07/20 05:03:06 dbj Exp $
 
 BLAKE2s (free42-nologo-3.0.13.tgz) = 70420aeb62b88ee0b2f3ada3c8ba8c40c036b0debadbf14599fccf4b352636b1
 SHA512 (free42-nologo-3.0.13.tgz) = 6037e86962157a2293915d2bd9343f7ddcddcbb346e98fe339a7ef1784c98249fb55c69c0cf6370a79db4628197ac851d4c4c05ec610a2911fa9c3b00a6d077d
 Size (free42-nologo-3.0.13.tgz) = 7458844 bytes
-SHA1 (patch-gtk_build-intel-lib.sh) = 352776e139cba7882ed24072dbffa23777a4c8a0
+SHA1 (patch-gtk_build-intel-lib.sh) = 2319c64c6c457fae43f1e82b306cc1d507eb30f7
diff -r 8b1541ee8baa -r 2c7f5b9ccc94 emulators/free42/patches/patch-gtk_build-intel-lib.sh
--- a/emulators/free42/patches/patch-gtk_build-intel-lib.sh     Wed Jul 20 02:16:49 2022 +0000
+++ b/emulators/free42/patches/patch-gtk_build-intel-lib.sh     Wed Jul 20 05:03:06 2022 +0000
@@ -1,12 +1,14 @@
-$NetBSD: patch-gtk_build-intel-lib.sh,v 1.2 2022/07/19 08:49:43 dbj Exp $
+$NetBSD: patch-gtk_build-intel-lib.sh,v 1.3 2022/07/20 05:03:06 dbj Exp $
 
 Avoid pkgsrc libtool on Darwin.
 
+Include fenv.h explicitly on QNX/Darwin/Apple/FreeBSD/NetBSD
+
 On NetBSD, build intel lib as if it was FreeBSD
 
 --- gtk/build-intel-lib.sh.orig        2022-06-16 09:39:50.000000000 +0000
 +++ gtk/build-intel-lib.sh
-@@ -45,6 +45,24 @@ tar xvfz ../inteldecimal/IntelRDFPMathLi
+@@ -45,6 +45,26 @@ tar xvfz ../inteldecimal/IntelRDFPMathLi
  cd IntelRDFPMathLib20U1
  patch -p0 <../intel-lib-linux.patch
  
@@ -15,9 +17,11 @@
 +    sed -e 's/libtool/xcrun libtool/' \
 +        LIBRARY/makefile.iml_head.orig > LIBRARY/makefile.iml_head
 +
-+# Fixup fenv.h inclusion detection. NetBSD uses _FENV_H_
++# Fixup fenv.h inclusion detection. NetBSD uses _FENV_H_, Darwin uses __FENV_H__
++# also actually include fenv.h on platforms that use it.
 +mv LIBRARY/src/bid_functions.h LIBRARY/src/bid_functions.h.orig && \
-+    sed -e 's/!defined (_FENV_H)/& \&\& !defined(_FENV_H_)/' \
++    sed -e 's/!defined (_FENV_H)/& \&\& !defined(_FENV_H_) \&\& !defined(__FENV_H__)/' \
++        -e 's/^#ifdef __QNX__/#if defined(__QNX__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__)/' \
 +        LIBRARY/src/bid_functions.h.orig > LIBRARY/src/bid_functions.h
 +
 +# make NetBSD look like FreeBSD to the Makefiles, this is a little hackish