commit: b69e8549e105545ea361c27f4e8e12a73a09b78c Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Fri Sep 13 23:01:01 2024 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Fri Sep 13 23:24:32 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b69e8549
dev-util/qbs: scrub and describe the ldconfig patch + revbump Note that "a few people" does not include me, couldn't reproduce. Not the first time I couldn't reproduce a sandbox issue like bug #915695 which had turned out to be due to the low stack size used in qtbase. This may be something similar that "env" ends up working around somehow but, being unable to reproduce, don't plan to dig into this myself and will consider this fixed (better patch welcome if someone figures out a better fix). Closes: https://bugs.gentoo.org/939142 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> dev-util/qbs/files/qbs-2.4.1-ldconfig.patch | 8 ++++++-- dev-util/qbs/{qbs-2.4.1.ebuild => qbs-2.4.1-r1.ebuild} | 0 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dev-util/qbs/files/qbs-2.4.1-ldconfig.patch b/dev-util/qbs/files/qbs-2.4.1-ldconfig.patch index b53ca73691e1..7638d5553d23 100644 --- a/dev-util/qbs/files/qbs-2.4.1-ldconfig.patch +++ b/dev-util/qbs/files/qbs-2.4.1-ldconfig.patch @@ -1,5 +1,9 @@ -diff --git a/share/qbs/modules/cpp/LinuxGCC.qbs b/share/qbs/modules/cpp/LinuxGCC.qbs -index 4b594a0aa..9ad2a613b 100644 +https://bugs.gentoo.org/939142 + +Exact cause unknown, but running qbs in portage's sandbox hangs +for a few people while running ldconfig, and using "env" seemingly +helps. Better (potentially upstreamable) patch welcome if someone +can figure out the right fix. --- a/share/qbs/modules/cpp/LinuxGCC.qbs +++ b/share/qbs/modules/cpp/LinuxGCC.qbs @@ -48,7 +48,7 @@ UnixGCC { diff --git a/dev-util/qbs/qbs-2.4.1.ebuild b/dev-util/qbs/qbs-2.4.1-r1.ebuild similarity index 100% rename from dev-util/qbs/qbs-2.4.1.ebuild rename to dev-util/qbs/qbs-2.4.1-r1.ebuild
