[gentoo-commits] repo/gentoo:master commit in: dev-lang/mlton/

[gentoo-commits] repo/gentoo:master commit in: dev-lang/mlton/

[Sam James]

commit:     87e90116bd4aba5aaa929160a49122929240c48d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 16 18:37:22 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 16 19:22:31 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87e90116

dev-lang/mlton: drop 20130715

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-lang/mlton/Manifest              |   3 -
 dev-lang/mlton/mlton-20130715.ebuild | 119 -----------------------------------
 2 files changed, 122 deletions(-)

diff --git a/dev-lang/mlton/Manifest b/dev-lang/mlton/Manifest
index 11ed417f884..85c3ef40274 100644
--- a/dev-lang/mlton/Manifest
+++ b/dev-lang/mlton/Manifest
@@ -1,5 +1,2 @@
-DIST mlton-20130715-1.amd64-linux.tgz 19512324 BLAKE2B 972688dcf6fc6ec17146e2597e6f5dab3b5df4e894697a98c68de61cf4728bf7e2e3ef1cee96befae90f9b555bed0b09cef846912225f8b770d20782fa833212 SHA512 ac41cf8b2afbba80ed25908b1842348eac1507b2aada103648171db1482358c4176b01d9266dfee053b20fc224653ec58ee9d3265672c02fa3774b7562a319bf
-DIST mlton-20130715-1.x86-linux.tgz 18065793 BLAKE2B d05ca4f46fb35b0b819e2678f282943fc9cd8f701bdf2a20da68b285db4618401b4138a227352e8aacef9f604528c7fafc0973631115954cfd91e01e9dd01a9d SHA512 13a996952df27420f05f8290920055231156c8982c1cf3c31259d73e0c534258e2aad91596e51809719ffb0b74652aa052d296000f2ab99462714d4ef9a41859
-DIST mlton-20130715.src.tgz 25606142 BLAKE2B 3fa3e8cf4991faef98e23ae4cbe9e0db5cae2e46ce27be57b784a81b576eeed17a179018e8b70d1264cb9595a3467900f034a2b4a7c114d1bac74025450741e1 SHA512 db273de47dc0059e830332b559918567f5153a0518e067ba71927e3705157f1984d6f6202201cef25aaef29d1a71a637e9a1cb30951e94dbfae4ab1a5e5d40d1
 DIST mlton-20180207-1.amd64-linux.tgz 18772644 BLAKE2B 7fe2d9db7edfb2d3e301be88e90b7dffe1441ff315ddac1464ef42fb436be1a9dc4e2c03fdb93880779360aed04cb7662a1a5a733f2d4158082d228f718d8b93 SHA512 74ab847ff567cde365a113f8819bae69cc18df20c441a6c6666b600980d2687faf143311f42be21a261b2493dc5c45fbecb4737c599cf767c3680afec06c2e0c
 DIST mlton-20180207.src.tgz 25003695 BLAKE2B 8cddfe83c76e05fda446917ddc85035b3d74534fe4bc597a839cd13cb59a15538f40a3f68bb8f7136f9cf8cb27a582e88ca0d14b8f7a4582a202b3bd075f3c9a SHA512 3599159950e857d257abce92abf5c548dd9c0b0cdc4ba0d7cdf9badb5d997f73386cd1ff79f563221b394dd831cb344e287927f90683b0715678edb3ca0ae15a

diff --git a/dev-lang/mlton/mlton-20130715.ebuild b/dev-lang/mlton/mlton-20130715.ebuild
deleted file mode 100644
index 1e3533a3767..00000000000
--- a/dev-lang/mlton/mlton-20130715.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit check-reqs eutils pax-utils
-
-DESCRIPTION="Standard ML optimizing compiler and libraries"
-BASE_URI="mirror://sourceforge/${PN}"
-SRC_URI="!binary? ( ${BASE_URI}/${P}.src.tgz )
-		  binary? ( amd64? ( ${BASE_URI}/${P}-1.amd64-linux.tgz )
-					x86?   ( ${BASE_URI}/${P}-1.x86-linux.tgz ) )"
-
-HOMEPAGE="http://www.mlton.org"
-
-LICENSE="HPND MIT"
-SLOT="0/${PV}"
-# there is support for ppc64 and ia64, but no
-# binaries are provided and there is no native
-# code generation for these platforms
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="binary doc"
-
-DEPEND="dev-libs/gmp:*
-		doc? ( virtual/latex-base )"
-RDEPEND="dev-libs/gmp:*"
-
-QA_PRESTRIPPED="binary? (
-	usr/bin/mlnlffigen
-	usr/bin/mllex
-	usr/bin/mlprof
-	usr/bin/mlyacc
-	usr/lib/mlton/mlton-compile
-)"
-
-# The resident set size of mlton-compile is 10GB on amd64
-CHECKREQS_MEMORY="4G"
-
-pkg_pretend() {
-	if use !binary; then
-		check-reqs_pkg_pretend
-	fi
-}
-
-src_unpack() {
-	if use !binary; then
-		unpack ${A}
-	else
-		mkdir -p "${S}" || die "Could not create ${S} directory"
-		pushd "${S}" || die "Could not cd to ${S}"
-		unpack ${A}
-		popd
-	fi
-}
-
-src_prepare() {
-	if use !binary; then
-		# The patch removing executable permissions from mmap'd memory regions is not upstreamed:
-		# http://pkgs.fedoraproject.org/cgit/mlton.git/tree/mlton-20070826-no-execmem.patch
-		epatch "${FILESDIR}/${PN}-20070826-no-execmem.patch"
-		# PIE in hardened requires executables to be linked with -fPIC. mlton by default tries
-		# to link executables against the non PIC objects in libmlton.a.  We may be bootstrapping
-		# with an old mlton install, if we tried to patch it (to link with libmlton-pic.a) we would
-		# need a patched binary.
-		# http://mlton.org/MLtonWorld says Executables that save and load worlds are incompatible
-		# with address space layout randomization (ASLR) of the executable.
-		epatch "${FILESDIR}/${PN}-20130715-no-PIE.patch"
-		# Remove dirs runtime compiler from all-no-docs to avoid repeating these steps.
-		# As we need to pax-mark the mlton-compiler executable.
-		epatch "${FILESDIR}/${PN}-20130715-split-make-for-pax-mark.patch"
-	fi
-}
-
-src_compile() {
-	if use !binary; then
-		has_version dev-lang/mlton || die "emerge with binary use flag first"
-
-		# Fix location in which to install man pages
-		sed -i 's@^MAN_PREFIX_EXTRA :=.*@MAN_PREFIX_EXTRA := /share@' \
-			Makefile || die 'sed Makefile failed'
-
-		emake -j1 dirs runtime compiler CFLAGS="${CFLAGS}"
-		pax-mark m "${S}/mlton/mlton-compile"
-		pax-mark m "${S}/build/lib/mlton-compile"
-
-		# Does not support parallel make
-		emake -j1 all-no-docs CFLAGS="${CFLAGS}"
-		if use doc; then
-			export VARTEXFONTS="${T}/fonts"
-			emake docs
-		fi
-	fi
-}
-
-src_install() {
-	if use binary; then
-		# Fix location in which to install man pages
-		mv "${S}/usr/man" "${S}/usr/share" || die "mv man failed"
-		pax-mark m "${S}/usr/lib/mlton/mlton-compile"
-		pax-mark m "${S}/usr/bin/mllex"
-		pax-mark m "${S}/usr/bin/mlyacc"
-		mv "${S}/usr" "${D}" || die "mv failed"
-	else
-		emake DESTDIR="${D}" install-no-docs
-		use doc && emake DESTDIR="${D}" TDOC="${D}"/usr/share/doc/${P} install-docs
-	fi
-}
-
-pkg_postinst() {
-	# There are PIC objects in libmlton-pic.a. -link-opt -lmlton-pic does not help as mlton
-	# specifies -lmlton before -lmlton-pic. It appears that it would be necessary to patch mlton
-	# to convince mlton to use the lib*-pic.a libraries when linking an executable.
-	ewarn 'PIE in Gentoo hardened requires executables to be linked with -fPIC. mlton by default links'
-	ewarn 'executables against the non PIC objects in libmlton.a.  http://mlton.org/MLtonWorld notes:'
-	ewarn 'Executables that save and load worlds are incompatible with address space layout'
-	ewarn 'randomization (ASLR) of the executable.'
-	ewarn 'To suppress the generation of position-independent executables.'
-	ewarn '-link-opt -fno-PIE'
-}

[gentoo-commits] repo/gentoo:master commit in: dev-lang/mlton/

[Sam James]

commit:     c9b5c10cc8dceeb1053ea6309098d5961df4b70b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 16 18:43:32 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 16 19:22:32 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9b5c10c

dev-lang/mlton: port to EAPI 7

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-lang/mlton/mlton-20180207.ebuild | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/dev-lang/mlton/mlton-20180207.ebuild b/dev-lang/mlton/mlton-20180207.ebuild
index dc132ad34ed..f55bb40d5a1 100644
--- a/dev-lang/mlton/mlton-20180207.ebuild
+++ b/dev-lang/mlton/mlton-20180207.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit check-reqs eutils multibuild pax-utils
+inherit check-reqs multibuild pax-utils
 
 DESCRIPTION="Standard ML optimizing compiler and libraries"
 BASE_URI="mirror://sourceforge/${PN}"
@@ -147,12 +147,15 @@ mlton_create_bin_stubs() {
 src_prepare() {
 	if ! use binary; then
 		# For Gentoo hardened: paxmark the mlton-compiler, mllex and mlyacc executables
-		epatch "${FILESDIR}/${PN}-20180207-paxmark.patch"
+		eapply "${FILESDIR}/${PN}-20180207-paxmark.patch"
 		# Fix the bootstrap-smlnj and bootstrap-polyml Makefile targets
-		epatch "${FILESDIR}/${PN}-20180207-bootstrap.patch"
+		eapply "${FILESDIR}/${PN}-20180207-bootstrap.patch"
 	fi
+
 	default
+
 	$(mlton_create_bin_stubs)
+
 	if use binary; then
 		pax-mark m "${R}/lib/${PN}/mlton-compile"
 		pax-mark m "${R}/bin/mllex"

[gentoo-commits] repo/gentoo:master commit in: dev-lang/mlton/

[Eli Schwartz]

commit:     92b53c9286a9ef6477922e4bd7a4f713ae3ed014
Author:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  9 04:28:02 2024 +0000
Commit:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
CommitDate: Tue Sep 10 01:04:13 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92b53c92

dev-lang/mlton: add github upstream metadata

Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org>

 dev-lang/mlton/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-lang/mlton/metadata.xml b/dev-lang/mlton/metadata.xml
index b6e787edaff3..4b9fb56b4de7 100644
--- a/dev-lang/mlton/metadata.xml
+++ b/dev-lang/mlton/metadata.xml
@@ -14,5 +14,6 @@
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">mlton</remote-id>
+		<remote-id type="github">MLton/mlton</remote-id>
 	</upstream>
 </pkgmetadata>

[gentoo-commits] repo/gentoo:master commit in: dev-lang/mlton/

[Eli Schwartz]

commit:     698e17aad2e95f56c53fc3139f45c03c33126edb
Author:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  9 04:20:48 2024 +0000
Commit:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
CommitDate: Tue Sep 10 01:04:12 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=698e17aa

dev-lang/mlton: mark as LTO-unsafe

It does something to mess with twelf's codegen. Assume it is too flaky
to handle LTO.

Bug: https://bugs.gentoo.org/863266
Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org>

 dev-lang/mlton/mlton-20180207.ebuild | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/dev-lang/mlton/mlton-20180207.ebuild b/dev-lang/mlton/mlton-20180207.ebuild
index 22cd719e8d45..44e66eaa657c 100644
--- a/dev-lang/mlton/mlton-20180207.ebuild
+++ b/dev-lang/mlton/mlton-20180207.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit check-reqs multibuild pax-utils
+inherit check-reqs flag-o-matic multibuild pax-utils
 
 DESCRIPTION="Standard ML optimizing compiler and libraries"
 BASE_URI="https://downloads.sourceforge.net/${PN}"
@@ -172,6 +172,10 @@ src_prepare() {
 }
 
 mlton_src_compile() {
+	# produces invalid codegen for twelf
+	# https://bugs.gentoo.org/863266
+	filter-lto
+
 	if [[ ${MULTIBUILD_VARIANT} == $(mlton_bootstrap_variant) ]]; then
 		emake -j1 \
 			"bootstrap-smlnj" \