Attachment 233980 Details for Bug 261820 – lang_mlton.diff (build on poudriere, major fixes to address memory usage on 32-bit)

[patch] lang_mlton.diff (build on poudriere, major fixes to address memory usage on 32-bit)

lang_mlton.diff (text/plain), 3.78 KB, created by Timothy Beyer on 2022-05-17 04:18:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Timothy Beyer

Created: 2022-05-17 04:18:09 UTC

Size: 3.78 KB

patch

obsolete

>From 0a475b7b83b0d205e2795594b4bb7f7e8e1e5c46 Mon Sep 17 00:00:00 2001
>From: Timothy Beyer <beyert_freebsd@fastmail.net>
>Date: Mon, 16 May 2022 20:53:46 -0700
>Subject: [PATCH] fix build of lang/joytran in poudriere
>
>---
> lang/{mlton.orig => mlton}/Makefile                | 21 ++++++++++++++-------
> /dev/null => lang/mlton/files/patch-mlton_Makefile | 11 +++++++++++
> 2 files changed, 25 insertions(+), 7 deletions(-)
> create mode 100644 lang/mlton/files/patch-mlton_Makefile
>
>diff --git a/lang/mlton.orig/Makefile b/lang/mlton/Makefile
>index 433ebbe..a0e6dcc 100644
>--- a/lang/mlton.orig/Makefile
>+++ b/lang/mlton/Makefile
>@@ -10,9 +10,10 @@
> # already-built version of MLton, BOOT_DIST, to use for bootstrapping.
> PORTNAME=	mlton
> PORTVERSION=	20210816
>+PORTREVISION=	1
> CATEGORIES=	lang
> MASTER_SITES+=	https://github.com/beyert/mlton-freebsd_bootstrap/raw/c7371c1/:bootstrap
>-DISTFILES+= ${BOOTNAME}.i386-${OPSYS:tl}-13.txz:bootstrap \
>+DISTFILES+=	${BOOTNAME}.i386-${OPSYS:tl}-13.txz:bootstrap \
> 	${BOOTNAME}.amd64-${OPSYS:tl}-13.txz:bootstrap \
> 	${BOOTNAME}.i386-${OPSYS:tl}-12.txz:bootstrap \
> 	${BOOTNAME}.amd64-${OPSYS:tl}-12.txz:bootstrap \
>@@ -116,6 +117,9 @@ ALL_TARGET=	polyml-mlton all
> ALL_TARGET=	polyml-mlton install-docs all
> .endif
> .elif ${PORT_OPTIONS:MNATIVE}
>+.if ${OSREL:R} >= 13
>+BOOTOSMAJ=	13
>+.endif
> BOOT_DIST=	${BOOTNAME}.${ARCH}-${OPSYS:tl}-${BOOTOSMAJ}.txz
> .else
> BOOT_DIST=
>@@ -144,6 +148,8 @@ GH_TAGNAME=	b2fca3d
> BOOT_CMD=	--xz
> BOOT_SUFX=	.txz
> 
>+RAM_SLOP_32=	$$(${SYSCTL} "hw.physmem" | ${AWK} '{ values = values" "$$2 } END { print values; }' | ${AWK} '{ "freebsd-version -r" | getline ver; split(ver, xs, "\."); kernelOSMAJ = xs[1]; osj = ${BOOTOSMAJ}; physmem = $$1 / 1024 / 1024 / 1024; os = kernelOSMAJ; maxphysmem = physmem; if (physmem > 3.2) { maxphysmem = 3.2; }; ospcent = 0.70; if (osj < 13 && os != osj) { ospcent = 0.65; } else if (os >= 13) { if (physmem < 3.1) { ospcent = 0.83; } else { ospcent = 0.80; } }; targetmem = maxphysmem * ospcent; targetpcent = targetmem / physmem; print int((targetpcent + 0.005) * 100) / 100; }')
>+
> post-extract:
> 	@${MKDIR} ${BOOT_WRKSRC}
> .if ${PORT_OPTIONS:MMLTON}
>@@ -162,17 +168,18 @@ post-extract:
> 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
> .endif
> .if ${ARCH} == "i386"
>-.if ${OSREL:R} == 13
>-	@${REINPLACE_CMD} -e 's/ram-slop 0\.7/ram-slop 0.8/' \
>+	@${REINPLACE_CMD} -e "s/ram-slop 0\.7/ram-slop ${RAM_SLOP_32}/" \
> 		-e 's|COMPILE_XARGS :=|COMPILE_XARGS := -polyvariance false|' \
> 		${WRKSRC}/mlton/Makefile
>+	@${REINPLACE_CMD} -e "s/ram-slop 0\.7/ram-slop ${RAM_SLOP_32}/" \
>+		-e "s|^OLD_MLTON_RUNTIME_ARGS :=|OLD_MLTON_RUNTIME_ARGS := ram-slop ${RAM_SLOP_32}|" \
>+		-e 's|^OLD_MLTON_COMPILE_ARGS :=|OLD_MLTON_COMPILE_ARGS := -polyvariance false|' \
>+		${WRKSRC}/Makefile.config
> .else
>-	@${REINPLACE_CMD} -e 's/ram-slop 0\.7/ram-slop 0.7/' \
>+	@${REINPLACE_CMD} \
> 		-e 's|COMPILE_XARGS :=|COMPILE_XARGS := -polyvariance false|' \
> 		${WRKSRC}/mlton/Makefile
>-.endif
>-	@${REINPLACE_CMD} -e 's/ram-slop 0\.7/ram-slop 0.8/' \
>-		-e 's|^OLD_MLTON_RUNTIME_ARGS :=|OLD_MLTON_RUNTIME_ARGS := ram-slop 0.8|' \
>+	@${REINPLACE_CMD} \
> 		-e 's|^OLD_MLTON_COMPILE_ARGS :=|OLD_MLTON_COMPILE_ARGS := -polyvariance false|' \
> 		${WRKSRC}/Makefile.config
> .endif
>diff --git a/lang/mlton/files/patch-mlton_Makefile b/lang/mlton/files/patch-mlton_Makefile
>new file mode 100644
>index 0000000..2a41a18
>--- /dev/null
>+++ b/lang/mlton/files/patch-mlton_Makefile
>@@ -0,0 +1,11 @@
>+--- mlton/Makefile.orig	2022-01-17 22:42:43 UTC
>++++ mlton/Makefile
>+@@ -39,6 +39,8 @@ ifeq ($(RUN_MLTON_VERSION), $(firstword $(sort $(RUN_M
>+ RUN_MLTON_COMPILE_XARGS += -drop-pass zone
>+ else ifeq ($(RUN_MLTON_VERSION), $(firstword $(sort $(RUN_MLTON_VERSION) 20191003)))
>+ RUN_MLTON_COMPILE_XARGS += -disable-pass zone
>++else
>++RUN_MLTON_COMPILE_XARGS += -disable-pass zone
>+ endif
>+ 
>+ FRONT_END_SOURCES :=		\

Actions: View | Diff

Attachments on bug 261820: 231671 | 233980 | 233985