summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository mirror & CI <repomirrorci@gentoo.org>2021-08-01 20:22:00 +0000
committerRepository mirror & CI <repomirrorci@gentoo.org>2021-08-01 20:22:00 +0000
commitb69f39df3be7ef97fa00f65c918bbe541a2dcc07 (patch)
tree2b629ddc17d4dacbcb56fa1d3010f86ae767388a
parent2021-08-01 20:01:34 UTC (diff)
parentsys-devel/autoconf: revbump for possible 2.71 race condition fix (diff)
downloadgentoo-b69f39df3be7ef97fa00f65c918bbe541a2dcc07.tar.gz
gentoo-b69f39df3be7ef97fa00f65c918bbe541a2dcc07.tar.bz2
gentoo-b69f39df3be7ef97fa00f65c918bbe541a2dcc07.zip
Merge updates from master
-rw-r--r--profiles/package.mask7
-rw-r--r--sys-devel/autoconf/autoconf-2.71-r1.ebuild (renamed from sys-devel/autoconf/autoconf-2.71.ebuild)8
-rw-r--r--sys-devel/autoconf/autoconf-9999.ebuild8
3 files changed, 11 insertions, 12 deletions
diff --git a/profiles/package.mask b/profiles/package.mask
index cd4b12bea06a..7f235c1948d9 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -541,10 +541,9 @@ dev-java/werken-xpath
=media-fonts/culmus-0.133-r1
# Lars Wendler <polynomial-c@gentoo.org> (2021-03-22)
-# Has unidentified race condition on very fast CPUs that causes maintainer-
-# mode to be triggered.
-# Most likely caused by the following upstream commit:
-# https://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=aba75f6d4a9c875a9d5d90a07c6b3678db66a4bf
+# On fast CPUs eautoreconf skips intermediate steps,
+# enables maintainer-mode or fails automake assertions:
+# bug #782985
sys-devel/autoconf:2.71
# Sam James <sam@gentoo.org> (2021-03-03)
diff --git a/sys-devel/autoconf/autoconf-2.71.ebuild b/sys-devel/autoconf/autoconf-2.71-r1.ebuild
index b142fa3470f5..f07c731cd372 100644
--- a/sys-devel/autoconf/autoconf-2.71.ebuild
+++ b/sys-devel/autoconf/autoconf-2.71-r1.ebuild
@@ -62,6 +62,10 @@ src_prepare() {
touch -r doc/{old_,}autoconf.texi || die
}
+src_test() {
+ emake check
+}
+
src_install() {
toolchain-autoconf_src_install
@@ -71,7 +75,3 @@ src_install() {
"${ED}"/usr/share/autoconf-*/build-aux/${f} || die
done
}
-
-src_test() {
- emake check
-}
diff --git a/sys-devel/autoconf/autoconf-9999.ebuild b/sys-devel/autoconf/autoconf-9999.ebuild
index d1da2e2e6307..cb3d17704c68 100644
--- a/sys-devel/autoconf/autoconf-9999.ebuild
+++ b/sys-devel/autoconf/autoconf-9999.ebuild
@@ -43,6 +43,10 @@ src_prepare() {
toolchain-autoconf_src_prepare
}
+src_test() {
+ emake check
+}
+
src_install() {
default
@@ -52,7 +56,3 @@ src_install() {
"${ED}"/usr/share/autoconf-*/build-aux/${f} || die
done
}
-
-src_test() {
- emake check
-}