commit: 02c65c7ba87060ba791736135ed220dee4a731d3 Author: Andrei Sabalenka <mechakotik <AT> gmail <DOT> com> AuthorDate: Fri Sep 13 20:45:58 2024 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Fri Sep 13 23:20:49 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02c65c7b
dev-util/qbs: workaround hangs when running inside sandbox Bug: https://bugs.gentoo.org/939142 Signed-off-by: Andrei Sabalenka <mechakotik <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/38598 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> dev-util/qbs/files/qbs-2.4.1-ldconfig.patch | 13 +++++++++++++ dev-util/qbs/qbs-2.4.1.ebuild | 1 + 2 files changed, 14 insertions(+) diff --git a/dev-util/qbs/files/qbs-2.4.1-ldconfig.patch b/dev-util/qbs/files/qbs-2.4.1-ldconfig.patch new file mode 100644 index 000000000000..b53ca73691e1 --- /dev/null +++ b/dev-util/qbs/files/qbs-2.4.1-ldconfig.patch @@ -0,0 +1,13 @@ +diff --git a/share/qbs/modules/cpp/LinuxGCC.qbs b/share/qbs/modules/cpp/LinuxGCC.qbs +index 4b594a0aa..9ad2a613b 100644 +--- a/share/qbs/modules/cpp/LinuxGCC.qbs ++++ b/share/qbs/modules/cpp/LinuxGCC.qbs +@@ -48,7 +48,7 @@ UnixGCC { + var paths = []; + var ldconfig = new Process(); + try { +- var success = ldconfig.exec("ldconfig", ["-vNX"]); ++ var success = ldconfig.exec("env", ["ldconfig", ["-vNX"]]); + if (success === -1) + return; + var line; diff --git a/dev-util/qbs/qbs-2.4.1.ebuild b/dev-util/qbs/qbs-2.4.1.ebuild index 45c3e36f74e4..c82bed8f744e 100644 --- a/dev-util/qbs/qbs-2.4.1.ebuild +++ b/dev-util/qbs/qbs-2.4.1.ebuild @@ -45,6 +45,7 @@ CMAKE_SKIP_TESTS=( PATCHES=( "${FILESDIR}"/${PN}-2.3.1-qtver.patch + "${FILESDIR}"/${PN}-2.4.1-ldconfig.patch ) python_check_deps() {
