commit:     1bc2bcb0b0858984506bb17c5d4c64039cf72abb
Author:     NHOrus <jy6x2b32pie9 <AT> yahoo <DOT> com>
AuthorDate: Sun Jan 12 14:08:47 2025 +0000
Commit:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Sun Jan 12 14:25:54 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bc2bcb0

dev-lang/eisl: Fix non-deterministic build failures

Adding "clean" as a target means it get mixed in-between two different
targets with MAKEOPTS=--shuffle.
This causes linkig failures, because some object files gets removed.

Closes: https://bugs.gentoo.org/939771
Signed-off-by: NHOrus <jy6x2b32pie9 <AT> yahoo.com>
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>

 dev-lang/eisl/eisl-5.38.ebuild | 7 +++++--
 dev-lang/eisl/eisl-5.39.ebuild | 7 +++++--
 dev-lang/eisl/eisl-5.40.ebuild | 7 +++++--
 dev-lang/eisl/eisl-9999.ebuild | 7 +++++--
 4 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/dev-lang/eisl/eisl-5.38.ebuild b/dev-lang/eisl/eisl-5.38.ebuild
index 1e6288f65690..fa1972eec46a 100644
--- a/dev-lang/eisl/eisl-5.38.ebuild
+++ b/dev-lang/eisl/eisl-5.38.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -35,7 +35,10 @@ DEPEND="
 PATCHES=( "${FILESDIR}/${PN}-3.60-Makefile.patch" )
 
 src_compile() {
-       emake CC="$(tc-getCC)" clean edlis eisl
+       # bug https://bugs.gentoo.org/939771
+       # don't clean and compile in one invocation with --shuffle possible
+       emake CC="$(tc-getCC)" clean
+       emake CC="$(tc-getCC)" edlis eisl
 }
 
 src_install() {

diff --git a/dev-lang/eisl/eisl-5.39.ebuild b/dev-lang/eisl/eisl-5.39.ebuild
index 0ef48728bee1..b73ff04a67d4 100644
--- a/dev-lang/eisl/eisl-5.39.ebuild
+++ b/dev-lang/eisl/eisl-5.39.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -35,7 +35,10 @@ DEPEND="
 PATCHES=( "${FILESDIR}/${PN}-3.60-Makefile.patch" )
 
 src_compile() {
-       emake CC="$(tc-getCC)" clean edlis eisl
+       # bug https://bugs.gentoo.org/939771
+       # don't clean and compile in one invocation with --shuffle possible
+       emake CC="$(tc-getCC)" clean
+       emake CC="$(tc-getCC)" edlis eisl
 }
 
 src_install() {

diff --git a/dev-lang/eisl/eisl-5.40.ebuild b/dev-lang/eisl/eisl-5.40.ebuild
index 0ef48728bee1..b73ff04a67d4 100644
--- a/dev-lang/eisl/eisl-5.40.ebuild
+++ b/dev-lang/eisl/eisl-5.40.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -35,7 +35,10 @@ DEPEND="
 PATCHES=( "${FILESDIR}/${PN}-3.60-Makefile.patch" )
 
 src_compile() {
-       emake CC="$(tc-getCC)" clean edlis eisl
+       # bug https://bugs.gentoo.org/939771
+       # don't clean and compile in one invocation with --shuffle possible
+       emake CC="$(tc-getCC)" clean
+       emake CC="$(tc-getCC)" edlis eisl
 }
 
 src_install() {

diff --git a/dev-lang/eisl/eisl-9999.ebuild b/dev-lang/eisl/eisl-9999.ebuild
index 866b41aa1866..e12350f772db 100644
--- a/dev-lang/eisl/eisl-9999.ebuild
+++ b/dev-lang/eisl/eisl-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -31,7 +31,10 @@ DEPEND="${RDEPEND}"
 PATCHES=( "${FILESDIR}/${PN}-3.60-Makefile.patch" )
 
 src_compile() {
-       emake CC="$(tc-getCC)" clean edlis eisl
+       # bug https://bugs.gentoo.org/939771
+       # don't clean and compile in one invocation with --shuffle possible
+       emake CC="$(tc-getCC)" clean
+       emake CC="$(tc-getCC)" edlis eisl
 }
 
 src_install() {

Reply via email to