[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openbsd-ports
Subject:    sysutils/findlib: USE_NOBTCFI and use ocaml module
From:       Christian Weisgerber <naddy () mips ! inka ! de>
Date:       2023-07-29 13:57:56
Message-ID: ZMUa5CTMrbDO1ZIS () lorvorc ! mips ! inka ! de
[Download RAW message or body]

Until the OCaml compiler is fixed, sysutils/findlib will need
USE_NOBTCFI.

The port doesn't automatically pick this up, because it doesn't use
the ocaml module... but why?  Looking at the commit history, the
module was removed from the port to avoid a circular dependency
with camlp4, but that is no longer a concern.

I think we can restore use of the ocaml module, simplify the port
accordingly, and pick up the USE_NOBTCFI setting that way, so we
don't have to keep it in sync manually.  Revision bump because
of USE_NOBTCFI.

OK?

-----------------------------------------------
 sysutils/findlib: use ocaml module and pick up USE_NOBTCFI
 
diff 82c29a31d947a94645a0fe965d3671d2e4409213 72c9db03c6d2b7f050e8d67efb17bda228011012
commit - 82c29a31d947a94645a0fe965d3671d2e4409213
commit + 72c9db03c6d2b7f050e8d67efb17bda228011012
blob - 105af517abd8450ad5befc8d8563540a4009c1f0
blob + b8035477e61108f17bb9be4786962444e16de9e0
--- sysutils/findlib/Makefile
+++ sysutils/findlib/Makefile
@@ -1,6 +1,7 @@
 COMMENT=	OCaml package manager
 CATEGORIES=	sysutils
 DISTNAME=	findlib-1.9.6
+REVISION=	0
 
 MASTER_SITES=	http://download.camlcity.org/download/
 
@@ -10,11 +11,9 @@ MODULES+=		x11/tk
 # MIT/X11
 PERMIT_PACKAGE=	Yes
 
-MODULES+=		x11/tk
+MODULES+=	lang/ocaml x11/tk
 
-WANTLIB +=		c m
-RUN_DEPENDS +=		lang/ocaml
-BUILD_DEPENDS +=	lang/ocaml
+WANTLIB +=	c m
 
 CONFIGURE_STYLE=simple
 CONFIGURE_ARGS= -no-custom \
@@ -26,20 +25,9 @@ PKG_ARGS+=-Dnative=1
 
 .include <bsd.port.arch.mk>
 .if ${PROPERTIES:Mocaml_native}
-PKG_ARGS+=-Dnative=1
-ALL_TARGET +=	all opt
-.else
-PKG_ARGS+=-Dnative=0
-ALL_TARGET =	all
+ALL_TARGET =	all opt
 .endif
 
-.if ${PROPERTIES:Mocaml_native_dynlink}
-PKG_ARGS+=-Ddynlink=1
-.else
-PKG_ARGS+=-Ddynlink=0
-.endif
-
-
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/findlib
 	mv \

-- 
Christian "naddy" Weisgerber                          naddy@mips.inka.de

[prev in list] [next in list] [prev in thread] [next in thread]