diff options
Diffstat (limited to 'dev-lang/ats2')
| -rw-r--r-- | dev-lang/ats2/Manifest | 5 | ||||
| -rw-r--r-- | dev-lang/ats2/ats2-0.4.2-r1.ebuild (renamed from dev-lang/ats2/ats2-0.4.2.ebuild) | 26 | ||||
| -rw-r--r-- | dev-lang/ats2/files/ats2-0.4.2-makefile_dist.patch | 13 |
3 files changed, 38 insertions, 6 deletions
diff --git a/dev-lang/ats2/Manifest b/dev-lang/ats2/Manifest index 60a902c4fe02..9e305ce9c591 100644 --- a/dev-lang/ats2/Manifest +++ b/dev-lang/ats2/Manifest @@ -1,4 +1,7 @@ AUX 50ats2-gentoo.el 200 BLAKE2B 4e07607ab27c87422e5f770746b3d077ca8c2564cb8a3a3bd79411c900dd41a2c1d79df1200b1fad19e8356fc22fb2250ea3f2aac95fa3e5ef9e696b397b59d7 SHA512 06c7550aca601a813dda7f3cc29642479cae27e4f605edd19bb3c41b5f76afdb84723bc81754d067eadd5e6074699969557459bfaf4200d3ecff8dc1867e4635 +AUX ats2-0.4.2-makefile_dist.patch 159 BLAKE2B 6a9ab24d381f259c858186223b803b4554fa1d507383b2835a80ed4078ba1036ec9876f009b321c81a765b2e94a8475b60bc1f95e631aac82dea065b6d52824e SHA512 5bd9a8259f523c86c21f18aee27d86e9d229c44f7af7ee77776c847d0d375c35448bce984f95e8a1b5e80b86f82ad537431b1203a31c6bf635d14185c4fc30d1 DIST ATS2-Postiats-gmp-0.4.2.tgz 4532277 BLAKE2B 3263ab8790c737a2a4f30d2acb770e4f5d3bbedd40136bbf07283541f5b6678aaba7031cf4a2e77552755e5510fcc65446dfc3499645f5c7f4c4e5bc52e8942d SHA512 cfc3f15b1365badcdce535afc7e71ffe25471f2661bdc47294b77c917049566eee4eeb8ec373f4121ad474b8528263d7b3ff8627c1f5b7f3ea7475cb95ca7597 -EBUILD ats2-0.4.2.ebuild 1985 BLAKE2B f2aac7797075569c6dd1e2abaa603de96dcb554e071d63f3930312ff99b653f5edd8c77b3188e81228100bddaf71cde22a29f99996be44beabc61a140cd73db3 SHA512 7b838c2ff4bd88e12b7961fefd0169b0e94bdfe50f33da61a6632bd4823547ab072488151566f6c5061af6d11c4d676b9b57ad3a3d4f32db74ebab7e858fb758 +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 +EBUILD ats2-0.4.2-r1.ebuild 2562 BLAKE2B de29da4655417aae73cdb73190d76a74a150855a5c4b7fab45fe08bad4cdd80149f87439ea49ada8da5e20e8601d153004e7dede64a44d0b1b340f8766a3667e SHA512 1e72703bf46913b4c6cde629405ff5391c56c9b536bbd4c542b2c651aa6a70d8b0654950e9cddd8a2341e63999d108ba7d3e3c3c3628ad09ee9f53165354a9e8 MISC metadata.xml 980 BLAKE2B ba3d935ee5cd32484046247817252585e5f1e8fc4fa502c7689ef90437674a02ca32506c59fadf6489ea43fb8ed769fece9554f7ab32b3e2774e382e66ae5cfc SHA512 86d721588d9c4f1e352c9b4cde43df44db269fb5189ed951244e57f7fe0c86fbc561ede3b5d09ab4b4a50b5fd036eac813e7619e462b2a9d382ec49176229380 diff --git a/dev-lang/ats2/ats2-0.4.2.ebuild b/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) + + ###### + # |