revert previous change which breaks ocaml on i386 as found by sthen

and as run into by me as well.

lang/ocaml/Makefile

@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.92 2022/01/12 21:30:14 chrisz Exp $
+# $OpenBSD: Makefile,v 1.93 2022/01/13 04:19:45 daniel Exp $
 
 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.12.1
-REVISION=		0
+REVISION=		1
 
 PKGNAME =		ocaml-${VERSION:C/\+//}
 

lang/ocaml/patches/patch-configure_ac

@@ -1,8 +1,33 @@
-$OpenBSD: patch-configure_ac,v 1.7 2022/01/11 19:01:28 chrisz Exp $
+$OpenBSD: patch-configure_ac,v 1.8 2022/01/13 04:19:45 daniel Exp $
 
 Index: configure.ac
 --- configure.ac.orig
 +++ configure.ac
+@@ -735,6 +735,11 @@ AS_CASE([$CC,$host],
+ )
+ 
+ 
++# Respect LDFLAGS and CFLAGS
++common_cflags="$common_cflags $CFLAGS"
++oc_ldflags="$oc_ldflags $LDFLAGS"
++
++
+ ## Program to use to install files
+ AC_PROG_INSTALL
+ 
+@@ -867,10 +872,10 @@ AS_IF([test x"$enable_shared" != "xno"],
+     [[*-*-linux*|*-*-freebsd[3-9]*|*-*-freebsd[1-9][0-9]*\
+     |*-*-openbsd*|*-*-netbsd*|*-*-dragonfly*|*-*-gnu*|*-*-haiku*]],
+       [sharedlib_cflags="-fPIC"
++      oc_ldflags="$oc_ldflags -Wl,-E"
+        AS_CASE([$CC,$host],
+            [gcc*,powerpc-*-linux*], [mksharedlib="$CC -shared -mbss-plt"],
+-           [mksharedlib="$CC -shared"])
+-      oc_ldflags="$oc_ldflags -Wl,-E"
++           [mksharedlib="$CC -shared $oc_ldflags"])
+       rpath="-Wl,-rpath,"
+       mksharedlibrpath="-Wl,-rpath,"
+       natdynlinkopts="-Wl,-E"
 @@ -864,6 +869,7 @@ AS_IF([test x"$enable_shared" != "xno"],
      [earm*-*-netbsd*], [natdynlink=true],
      [aarch64-*-linux*], [natdynlink=true],