pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
ocaml: centralize workaround for native-compilation problem
Module Name: pkgsrc-wip
Committed By: Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By: wiz
Date: Fri Aug 29 02:20:07 2025 +0200
Changeset: 8fbf560e95562441e261e71f8bfd2e67b40f4f85
Modified Files:
ocaml/Makefile
ocaml/native.mk
Log Message:
ocaml: centralize workaround for native-compilation problem
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=8fbf560e95562441e261e71f8bfd2e67b40f4f85
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
ocaml/Makefile | 2 +-
ocaml/native.mk | 11 ++++++-----
2 files changed, 7 insertions(+), 6 deletions(-)
diffs:
diff --git a/ocaml/Makefile b/ocaml/Makefile
index 310fe6ece5..2d10b162de 100644
--- a/ocaml/Makefile
+++ b/ocaml/Makefile
@@ -35,7 +35,7 @@ UNLIMIT_RESOURCES= stacksize
.include "options.mk"
.include "native.mk"
-.if ${OCAML_USE_OPT_COMPILER} == "yesTODOBROKEN"
+.if ${OCAML_USE_OPT_COMPILER} == "yes"
CONFIGURE_ARGS+= --enable-native-compiler
BUILD_TARGET= world.opt
.else
diff --git a/ocaml/native.mk b/ocaml/native.mk
index 9654eff438..dc264d82b3 100644
--- a/ocaml/native.mk
+++ b/ocaml/native.mk
@@ -27,6 +27,11 @@ _DEF_VARS.ocaml= \
.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \
${MACHINE_ARCH:M*arm*} || (${MACHINE_ARCH} == "aarch64") || \
(${MACHINE_ARCH} == "aarch64eb") || (${MACHINE_ARCH} == "x86_64")
+# works when building outside of pkgsrc, breaks
+# when building inside
+# https://github.com/ocaml/ocaml/issues/14207#issuecomment-3228396849
+OCAML_USE_OPT_COMPILER?= no
+
OCAML_USE_OPT_COMPILER?= yes
.else
OCAML_USE_OPT_COMPILER?= no
@@ -35,11 +40,7 @@ OCAML_USE_OPT_COMPILER?= no
# Things that get installed with the opt compiler
PLIST_VARS+= ocaml-opt
-# works when building outside of pkgsrc, breaks
-# when building inside
-# https://github.com/ocaml/ocaml/issues/14207#issuecomment-3228396849
-
-.if ${OCAML_USE_OPT_COMPILER} == "yesTODOBROKEN"
+.if ${OCAML_USE_OPT_COMPILER} == "yes"
# The opt compiler needs the C compiler suite
USE_LANGUAGES+= c
PLIST.ocaml-opt= yes
Home |
Main Index |
Thread Index |
Old Index