From 912dfbf06a62de9a565a5963e63b3c5ad8c85721 Mon Sep 17 00:00:00 2001 From: dbj Date: Tue, 19 Jul 2022 08:49:43 +0000 Subject: emulators/free42: fix fenv.h inclusion detection on NetBSD --- emulators/free42/distinfo | 4 ++-- emulators/free42/patches/patch-gtk_build-intel-lib.sh | 9 +++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/emulators/free42/distinfo b/emulators/free42/distinfo index 39400b6ebc0..adfadae221d 100644 --- a/emulators/free42/distinfo +++ b/emulators/free42/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.6 2022/07/14 05:09:46 dbj Exp $ +$NetBSD: distinfo,v 1.7 2022/07/19 08:49:43 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) = ecd5182d01109b42f139c26c8f31e315fe9f79ae +SHA1 (patch-gtk_build-intel-lib.sh) = 352776e139cba7882ed24072dbffa23777a4c8a0 diff --git a/emulators/free42/patches/patch-gtk_build-intel-lib.sh b/emulators/free42/patches/patch-gtk_build-intel-lib.sh index 924889d979d..e298b6ae811 100644 --- a/emulators/free42/patches/patch-gtk_build-intel-lib.sh +++ b/emulators/free42/patches/patch-gtk_build-intel-lib.sh @@ -1,4 +1,4 @@ -$NetBSD: patch-gtk_build-intel-lib.sh,v 1.1 2022/07/14 05:09:46 dbj Exp $ +$NetBSD: patch-gtk_build-intel-lib.sh,v 1.2 2022/07/19 08:49:43 dbj Exp $ Avoid pkgsrc libtool on Darwin. @@ -6,7 +6,7 @@ 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,19 @@ tar xvfz ../inteldecimal/IntelRDFPMathLi +@@ -45,6 +45,24 @@ tar xvfz ../inteldecimal/IntelRDFPMathLi cd IntelRDFPMathLib20U1 patch -p0 <../intel-lib-linux.patch @@ -15,6 +15,11 @@ On NetBSD, build intel lib as if it was FreeBSD + sed -e 's/libtool/xcrun libtool/' \ + LIBRARY/makefile.iml_head.orig > LIBRARY/makefile.iml_head + ++# Fixup fenv.h inclusion detection. NetBSD uses _FENV_H_ ++mv LIBRARY/src/bid_functions.h LIBRARY/src/bid_functions.h.orig && \ ++ sed -e 's/!defined (_FENV_H)/& \&\& !defined(_FENV_H_)/' \ ++ LIBRARY/src/bid_functions.h.orig > LIBRARY/src/bid_functions.h ++ +# make NetBSD look like FreeBSD to the Makefiles, this is a little hackish +if [ `uname -s` = "NetBSD" ]; then + OS_ARG="CFLAGS_OPT=-DLINUX" -- cgit v1.2.3