On 2024/04/23 11:29, Dave Voutila wrote:
>
> Stuart Henderson <s...@spacehopper.org> writes:
>
> > The updated ocaml version fails to build on i386; the new ocamlc.opt run
> > as part of the build segfaults segfaults, looks like during runtime linking.
> >
>
> This fixes it in my i386 vm. Can you try this? Should probably get
> tested with other ocaml-based ports on i386 before I commit this time :|
I've built opam and coccinelle (and thus various dependencies as well) with
this.
> diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile
> index 244c1b7315f..d88cb8f466d 100644
> --- a/lang/ocaml/Makefile
> +++ b/lang/ocaml/Makefile
> @@ -3,6 +3,7 @@ COMMENT = ML language with complete class-based
> objective system
> # XXX Don't even think of updating ocaml alone.
> # Do check that the ports that depend on it still work, or repair them.
> VERSION= 4.14.2
> +REVISION= 0
Doesn't hurt but I'd drop REVISION because it didn't build on i386
before, and the change doesn't affect other archs.
> # if the ocaml compiler gains support for BTI, as well as
> # removing USE_NOBTCFI here (or changing to an arch-dependent
> @@ -60,8 +61,6 @@ LDFLAGS += -L${LOCALBASE}/lib
> .if ${MACHINE_ARCH} == "i386"
> # configure: error: fma does not work, enable emulation with
> --enable-imprecise-c99-float-ops
> CONFIGURE_ARGS += --enable-imprecise-c99-float-ops
> -# non-PIC assembly in asmrun/i386.S
> -LDFLAGS+= -Wl,-z,notext
> .endif
>
> USE_GMAKE= Yes
OK
