Tue Jul 19 08:49:43 2022 UTC ()
emulators/free42: fix fenv.h inclusion detection on NetBSD


(dbj)
diff -r1.6 -r1.7 pkgsrc/emulators/free42/distinfo
diff -r1.1 -r1.2 pkgsrc/emulators/free42/patches/patch-gtk_build-intel-lib.sh
cvs diff -r1.6 -r1.7 pkgsrc/emulators/free42/distinfo (expand / switch to unified diff)

--- pkgsrc/emulators/free42/distinfo 2022/07/14 05:09:46 1.6
+++ pkgsrc/emulators/free42/distinfo 2022/07/19 08:49:43 1.7
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.6 2022/07/14 05:09:46 dbj Exp $ 1$NetBSD: distinfo,v 1.7 2022/07/19 08:49:43 dbj Exp $
2 2
3BLAKE2s (free42-nologo-3.0.13.tgz) = 70420aeb62b88ee0b2f3ada3c8ba8c40c036b0debadbf14599fccf4b352636b1 3BLAKE2s (free42-nologo-3.0.13.tgz) = 70420aeb62b88ee0b2f3ada3c8ba8c40c036b0debadbf14599fccf4b352636b1
4SHA512 (free42-nologo-3.0.13.tgz) = 6037e86962157a2293915d2bd9343f7ddcddcbb346e98fe339a7ef1784c98249fb55c69c0cf6370a79db4628197ac851d4c4c05ec610a2911fa9c3b00a6d077d 4SHA512 (free42-nologo-3.0.13.tgz) = 6037e86962157a2293915d2bd9343f7ddcddcbb346e98fe339a7ef1784c98249fb55c69c0cf6370a79db4628197ac851d4c4c05ec610a2911fa9c3b00a6d077d
5Size (free42-nologo-3.0.13.tgz) = 7458844 bytes 5Size (free42-nologo-3.0.13.tgz) = 7458844 bytes
6SHA1 (patch-gtk_build-intel-lib.sh) = ecd5182d01109b42f139c26c8f31e315fe9f79ae 6SHA1 (patch-gtk_build-intel-lib.sh) = 352776e139cba7882ed24072dbffa23777a4c8a0
cvs diff -r1.1 -r1.2 pkgsrc/emulators/free42/patches/patch-gtk_build-intel-lib.sh (expand / switch to unified diff)

--- pkgsrc/emulators/free42/patches/patch-gtk_build-intel-lib.sh 2022/07/14 05:09:46 1.1
+++ pkgsrc/emulators/free42/patches/patch-gtk_build-intel-lib.sh 2022/07/19 08:49:43 1.2
@@ -1,28 +1,33 @@ @@ -1,28 +1,33 @@
1$NetBSD: patch-gtk_build-intel-lib.sh,v 1.1 2022/07/14 05:09:46 dbj Exp $ 1$NetBSD: patch-gtk_build-intel-lib.sh,v 1.2 2022/07/19 08:49:43 dbj Exp $
2 2
3Avoid pkgsrc libtool on Darwin. 3Avoid pkgsrc libtool on Darwin.
4 4
5On NetBSD, build intel lib as if it was FreeBSD 5On NetBSD, build intel lib as if it was FreeBSD
6 6
7--- gtk/build-intel-lib.sh.orig 2022-06-16 09:39:50.000000000 +0000 7--- gtk/build-intel-lib.sh.orig 2022-06-16 09:39:50.000000000 +0000
8+++ gtk/build-intel-lib.sh 8+++ gtk/build-intel-lib.sh
9@@ -45,6 +45,19 @@ tar xvfz ../inteldecimal/IntelRDFPMathLi 9@@ -45,6 +45,24 @@ tar xvfz ../inteldecimal/IntelRDFPMathLi
10 cd IntelRDFPMathLib20U1 10 cd IntelRDFPMathLib20U1
11 patch -p0 <../intel-lib-linux.patch 11 patch -p0 <../intel-lib-linux.patch
12  12
13+# avoid pkgsrc libtool on Darwin 13+# avoid pkgsrc libtool on Darwin
14+mv LIBRARY/makefile.iml_head LIBRARY/makefile.iml_head.orig && \ 14+mv LIBRARY/makefile.iml_head LIBRARY/makefile.iml_head.orig && \
15+ sed -e 's/libtool/xcrun libtool/' \ 15+ sed -e 's/libtool/xcrun libtool/' \
16+ LIBRARY/makefile.iml_head.orig > LIBRARY/makefile.iml_head 16+ LIBRARY/makefile.iml_head.orig > LIBRARY/makefile.iml_head
17+ 17+
 18+# Fixup fenv.h inclusion detection. NetBSD uses _FENV_H_
 19+mv LIBRARY/src/bid_functions.h LIBRARY/src/bid_functions.h.orig && \
 20+ sed -e 's/!defined (_FENV_H)/& \&\& !defined(_FENV_H_)/' \
 21+ LIBRARY/src/bid_functions.h.orig > LIBRARY/src/bid_functions.h
 22+
18+# make NetBSD look like FreeBSD to the Makefiles, this is a little hackish 23+# make NetBSD look like FreeBSD to the Makefiles, this is a little hackish
19+if [ `uname -s` = "NetBSD" ]; then 24+if [ `uname -s` = "NetBSD" ]; then
20+ OS_ARG="CFLAGS_OPT=-DLINUX" 25+ OS_ARG="CFLAGS_OPT=-DLINUX"
21+ mv LIBRARY/makefile.iml_head LIBRARY/makefile.iml_head.orig2 && \ 26+ mv LIBRARY/makefile.iml_head LIBRARY/makefile.iml_head.orig2 && \
22+ sed -e 's/FreeBSD/NetBSD/' -e 's/FREEBSD/NETBSD/' \ 27+ sed -e 's/FreeBSD/NetBSD/' -e 's/FREEBSD/NETBSD/' \
23+ LIBRARY/makefile.iml_head.orig2 > LIBRARY/makefile.iml_head 28+ LIBRARY/makefile.iml_head.orig2 > LIBRARY/makefile.iml_head
24+fi 29+fi
25+ 30+
26 # When building for architectures other than x86 or x86_64, I remove the 31 # When building for architectures other than x86 or x86_64, I remove the
27 # section titled "Determine host architecture" in 32 # section titled "Determine host architecture" in
28 # IntelRDFPMathLib20U1/LIBRARY/makefile.iml_head, and replace it with a simple 33 # IntelRDFPMathLib20U1/LIBRARY/makefile.iml_head, and replace it with a simple