Fri Oct 21 19:16:35 2022 UTC ()
Pullup ticket #6686 - requested by nia
lang/ocaml: evbarm build fix

Revisions pulled up:
- lang/ocaml/Makefile                                           1.146

---
   Module Name:	pkgsrc
   Committed By:	nia
   Date:		Sat Oct  8 11:11:16 UTC 2022

   Modified Files:
   	pkgsrc/lang/ocaml: Makefile

   Log Message:
   ocaml: Needs imprecise-c99-float-ops to build on NetBSD/arm


(bsiegert)
diff -r1.145 -r1.145.4.1 pkgsrc/lang/ocaml/Makefile
cvs diff -r1.145 -r1.145.4.1 pkgsrc/lang/ocaml/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/ocaml/Makefile 2022/06/24 12:30:09 1.145
+++ pkgsrc/lang/ocaml/Makefile 2022/10/21 19:16:35 1.145.4.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.145 2022/06/24 12:30:09 gdt Exp $ 1# $NetBSD: Makefile,v 1.145.4.1 2022/10/21 19:16:35 bsiegert Exp $
2 2
3.include "Makefile.common" 3.include "Makefile.common"
4 4
5TEST_PROGRAM= ocamltest 5TEST_PROGRAM= ocamltest
6MAKE_JOBS_SAFE= no 6MAKE_JOBS_SAFE= no
7UNLIMIT_RESOURCES= stacksize 7UNLIMIT_RESOURCES= stacksize
8 8
9USE_TOOLS+= bash 9USE_TOOLS+= bash
10USE_LANGUAGES+= c 10USE_LANGUAGES+= c
11USE_LIBTOOL= yes 11USE_LIBTOOL= yes
12USE_GNU_CONFIGURE_HOST= no 12USE_GNU_CONFIGURE_HOST= no
13 13
14#USE_GCC_RUNTIME= yes 14#USE_GCC_RUNTIME= yes
@@ -17,27 +17,28 @@ USE_GNU_CONFIGURE_HOST= no @@ -17,27 +17,28 @@ USE_GNU_CONFIGURE_HOST= no
17.include "native.mk" 17.include "native.mk"
18 18
19# Options 19# Options
20 20
21.if ${OCAML_USE_OPT_COMPILER} == "yes" 21.if ${OCAML_USE_OPT_COMPILER} == "yes"
22CONFIGURE_ARGS+= --enable-native-compiler 22CONFIGURE_ARGS+= --enable-native-compiler
23BUILD_TARGET= world.opt 23BUILD_TARGET= world.opt
24.else 24.else
25CONFIGURE_ARGS+= --disable-native-compiler 25CONFIGURE_ARGS+= --disable-native-compiler
26BUILD_TARGET= world 26BUILD_TARGET= world
27.endif 27.endif
28 28
29# configure: error: fma does not work, enable emulation with --enable-imprecise-c99-float-ops 29# configure: error: fma does not work, enable emulation with --enable-imprecise-c99-float-ops
30.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "i386" 30.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || \
 31 !empty(MACHINE_PLATFORM:MNetBSD-*-earm*)
31CONFIGURE_ARGS+= --enable-imprecise-c99-float-ops 32CONFIGURE_ARGS+= --enable-imprecise-c99-float-ops
32.endif 33.endif
33 34
34# This is needed because ${WRKSRC}/build/partial-install.sh uses 35# This is needed because ${WRKSRC}/build/partial-install.sh uses
35# $PWD as part of its script. However, with /bin/sh on SunOS 36# $PWD as part of its script. However, with /bin/sh on SunOS
36# (cd work/foo-1.0 && echo $PWD) will show that the value of PWD is 37# (cd work/foo-1.0 && echo $PWD) will show that the value of PWD is
37# set before the cd takes place and is then passed down. So the end 38# set before the cd takes place and is then passed down. So the end
38# result is when ./build/partial-install.sh is called, PWD is set 39# result is when ./build/partial-install.sh is called, PWD is set
39# to /usr/pkgsrc/devel/ocaml instead of ${WRKSRC}. /bin/ksh, which 40# to /usr/pkgsrc/devel/ocaml instead of ${WRKSRC}. /bin/ksh, which
40# is what ${SH} is on SunOS, doesn't exhibit this behaviour. 41# is what ${SH} is on SunOS, doesn't exhibit this behaviour.
41.if ${OPSYS} == "SunOS" 42.if ${OPSYS} == "SunOS"
42INSTALL_MAKE_FLAGS+= SHELL=${SH:Q} 43INSTALL_MAKE_FLAGS+= SHELL=${SH:Q}
43.endif 44.endif