Hi Daniel,
this is for fixing OCaml regression tests. aarch64 has a broken objdump
and needs to use llang-objdump. OK?
Christopher
Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/ocaml/Makefile,v
retrieving revision 1.91
diff -u -p -r1.91 Makefile
--- Makefile 18 Dec 2021 01:57:22 -0000 1.91
+++ Makefile 21 Dec 2021 05:47:49 -0000
@@ -25,12 +25,18 @@ MAINTAINER= Anil Madhavapeddy <avsm@open
# QPL/LGPL
PERMIT_PACKAGE= Yes
+.include <bsd.port.arch.mk>
+
AUTOCONF_VERSION = 2.69
CONFIGURE_STYLE = gnu autoconf no-autoheader
CONFIGURE_ENV+= CFLAGS="${CFLAGS}" \
CPPFLAGS="${CFLAGS} ${CPPFLAGS}" \
LDFLAGS="${LDFLAGS}"
-CONFIGURE_ARGS += --disable-force-safe-string
+.if ${PROPERTIES:Mclang}
+CONFIGURE_ENV+= OBJDUMP=/usr/bin/llvm-objdump
+.endif
+CONFIGURE_ARGS += --disable-force-safe-string \
+ --enable-ocamltest
CFLAGS += -I${LOCALBASE}/include
LDFLAGS += -L${LOCALBASE}/lib
@@ -47,12 +53,9 @@ WANTLIB = c iberty m pthread z
# for libbfd (used by ocamlobjinfo on .cmxs files)
BUILD_DEPENDS += devel/gdb
-.include <bsd.port.arch.mk>
-
.if ${PROPERTIES:Mocaml_native}
ALL_TARGET= world.opt
PKG_ARGS += -Dnative=1
-TEST_DEPENDS += ${BUILD_PKGPATH}
.if ${PROPERTIES:Mocaml_native_dynlink}
PKG_ARGS += -Ddynlink=1
@@ -66,6 +69,8 @@ PKG_ARGS += -Dnative=0
NO_TEST = yes
.endif
+TEST_TARGET = tests
+
DPB_PROPERTIES += parallel
post-install:
@@ -85,7 +90,5 @@ post-install:
# connection to internet
TEST_IS_INTERACTIVE = Yes
-do-test:
- @cd ${WRKSRC}/testsuite && ulimit -Sn 256 && ${MAKE_PROGRAM} all
.include <bsd.port.mk>
