commit: 2df15d3d969420af92b0482221005aa2c9938a87 Author: Maciej Barć <xgqt <AT> gentoo <DOT> org> AuthorDate: Wed Oct 23 21:44:46 2024 +0000 Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org> CommitDate: Wed Oct 23 22:15:23 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2df15d3d
dev-lang/ats2: patches to Makefile and misc ones from Debian Two patches come from the Debian's ATS2 package, that is: "deprecated-cl-package" and "prelude-function-prototypes". Bug: https://bugs.gentoo.org/923881 Closes: https://bugs.gentoo.org/920639 Closes: https://bugs.gentoo.org/941105 Closes: https://bugs.gentoo.org/917412 Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org> dev-lang/ats2/Manifest | 2 ++ .../{ats2-0.4.2.ebuild => ats2-0.4.2-r1.ebuild} | 26 +++++++++++++++++----- dev-lang/ats2/files/ats2-0.4.2-makefile_dist.patch | 13 +++++++++++ 3 files changed, 36 insertions(+), 5 deletions(-) diff --git a/dev-lang/ats2/Manifest b/dev-lang/ats2/Manifest index d4fffea70473..8ed5b5df2f3a 100644 --- a/dev-lang/ats2/Manifest +++ b/dev-lang/ats2/Manifest @@ -1 +1,3 @@ DIST ATS2-Postiats-gmp-0.4.2.tgz 4532277 BLAKE2B 3263ab8790c737a2a4f30d2acb770e4f5d3bbedd40136bbf07283541f5b6678aaba7031cf4a2e77552755e5510fcc65446dfc3499645f5c7f4c4e5bc52e8942d SHA512 cfc3f15b1365badcdce535afc7e71ffe25471f2661bdc47294b77c917049566eee4eeb8ec373f4121ad474b8528263d7b3ff8627c1f5b7f3ea7475cb95ca7597 +DIST ats2-0.4.2-2-deprecated-cl-package.patch 2456 BLAKE2B 6a81727dd0dd384009683ce430d1d50caf1fea0d02f31ae0fab4e60861f657d348a334f454e0ea44024a10599c449385ec8bf694463a4a8d956648610c0a6f6f SHA512 1746072b88d8987648a0c7d606c1e0dd1b38d07d1119b89ca6999327aa81068c70e26ddc70bd26a7f5d1d1826fa0e71320a6d52f39aa05c2cd1d858557ba3afc +DIST ats2-0.4.2-2-prelude-function-prototypes.patch 3715 BLAKE2B aff950ceb7b5419973b8ed8a82de92780a32ca4c5beb8856dfe89409fd47d91e154251cb8ab0d978a9ac50f2b6f91395629c78ddecfbc28c91a6b6314af80a7e SHA512 a4bda6c244a94347ec5b32f8b68e4057bf3a442bc8e5e08a7c059881366d25f93193e7d9942d93e2d80082ba9cd08a5fd0bc7b41b74c5056be83cd10a89c55f1 diff --git a/dev-lang/ats2/ats2-0.4.2.ebuild b/dev-lang/ats2/ats2-0.4.2-r1.ebuild similarity index 68% rename from dev-lang/ats2/ats2-0.4.2.ebuild rename to dev-lang/ats2/ats2-0.4.2-r1.ebuild index e4f7eae958af..a1f05aca38fb 100644 --- a/dev-lang/ats2/ats2-0.4.2.ebuild +++ b/dev-lang/ats2/ats2-0.4.2-r1.ebuild @@ -1,14 +1,22 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit elisp-common toolchain-funcs +inherit elisp-common flag-o-matic toolchain-funcs DESCRIPTION="Functional programming language with dependent types" HOMEPAGE="https://www.cs.bu.edu/~hwxi/atslangweb/ https://sourceforge.net/projects/ats2-lang/"; -SRC_URI="http://downloads.sourceforge.net/sourceforge/ats2-lang/ATS2-Postiats-gmp-${PV}.tgz"; + +SRC_URI=" + http://downloads.sourceforge.net/sourceforge/ats2-lang/ATS2-Postiats-gmp-${PV}.tgz + + https://sources.debian.org/data/main/a/ats2-lang/0.4.2-2/debian/patches/deprecated-cl-package + -> ${PN}-0.4.2-2-deprecated-cl-package.patch + https://sources.debian.org/data/main/a/ats2-lang/0.4.2-2/debian/patches/prelude-function-prototypes + -> ${PN}-0.4.2-2-prelude-function-prototypes.patch +" S="${WORKDIR}/ATS2-Postiats-gmp-${PV}" LICENSE="GPL-3+" @@ -24,6 +32,12 @@ DEPEND=" ${RDEPEND} " +PATCHES=( + "${FILESDIR}/${PN}-0.4.2-makefile_dist.patch" + "${DISTDIR}/${PN}-0.4.2-2-deprecated-cl-package.patch" + "${DISTDIR}/${PN}-0.4.2-2-prelude-function-prototypes.patch" +) + SITEFILE="50${PN}-gentoo.el" src_prepare() { @@ -32,8 +46,6 @@ src_prepare() { sed -i Makefile \ -e "/^CFLAGS/s|=| = ${CFLAGS}|" \ -e "/^LDFLAGS/s|=| = ${LDFLAGS}|" \ - -e "/^MAKE/s|=make| ?= \$(MAKE)|g" \ - -e "/^MAKEJ4/s|-j4||" \ || die sed -i ccomp/atslib/Makefile \ @@ -53,6 +65,10 @@ src_prepare() { } src_compile() { + # Not really accurate but need Makefile investigation and patches. + # See: https://bugs.gentoo.org/941105 and https://bugs.gentoo.org/923881 + filter-lto + emake -j1 CC="$(tc-getCC)" GCC="$(tc-getCC)" CCOMP="$(tc-getCC)" all if use emacs ; then diff --git a/dev-lang/ats2/files/ats2-0.4.2-makefile_dist.patch b/dev-lang/ats2/files/ats2-0.4.2-makefile_dist.patch new file mode 100644 index 000000000000..ce24f44d32fc --- /dev/null +++ b/dev-lang/ats2/files/ats2-0.4.2-makefile_dist.patch @@ -0,0 +1,13 @@ +--- a/Makefile_dist ++++ b/Makefile_dist +@@ -19,8 +19,8 @@ RMRF=rm -rf + + ###### + +-MAKE=make +-MAKEJ4=make -j4 ++MAKE ?= $(MAKE) ++MAKEJ4 ?= $(MAKE) + + ###### + #
