dev-lang/erlang: fix USE=pgo loop, bug #686786

It does not completely recover PGO support but
at least stops ./configure from looping indefinitely.

Reported-by: Dennis Schridde
Bug: https://bugs.gentoo.org/686786
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>

diff --git a/dev-lang/erlang/erlang-21.3-r1.ebuild b/dev-lang/erlang/erlang-21.3-r1.ebuild
index 75e06e5602b19e478227727870107fbe8bbbd134..ed159555d82f52a0bae493f078495d993e1b3973 100644 (file)
--- a/dev-lang/erlang/erlang-21.3-r1.ebuild
+++ b/dev-lang/erlang/erlang-21.3-r1.ebuild
@@ -49,6 +49,7 @@ PATCHES=(
        "${FILESDIR}/${PN}-add-epmd-pid-file-creation-for-openrc.patch"
        "${FILESDIR}/${PN}-custom-autoconf.patch"
        "${FILESDIR}/${PN}-21.3-lto.patch"
+       "${FILESDIR}/${PN}-21.3-pgo-loop.patch"
 )
 
 SITEFILE=50"${PN}"-gentoo.el

diff --git a/dev-lang/erlang/files/erlang-21.3-pgo-loop.patch b/dev-lang/erlang/files/erlang-21.3-pgo-loop.patch
new file mode 100644 (file)
index 0000000..82add99
--- /dev/null
+++ b/dev-lang/erlang/files/erlang-21.3-pgo-loop.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/686786
+
+--- a/erts/configure.in
++++ b/erts/configure.in
+@@ -682,7 +682,7 @@ elif test "X$PROFILE_INSTR_GENERATE" = "Xtrue" -a "X$PROFILE_INSTR_USE" = "Xtrue
+   PROFILE_COMPILER=clang
+   AC_MSG_RESULT([yes, using -fprofile-instr-generate])
+ else
+-  if $enable_pgo = yes; then
++  if test $enable_pgo = yes; then
+     AC_MSG_ERROR(cannot use PGO with this compiler)
+   else
+     AC_MSG_RESULT([no])