* [gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/files/, dev-util/qbs/
@ 2017-08-19 17:15 Davide Pesavento
0 siblings, 0 replies; 5+ messages in thread
From: Davide Pesavento @ 2017-08-19 17:15 UTC (permalink / raw
To: gentoo-commits
commit: 4e752962e5bd8e0270ae8f2614e979cbcbd72624
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 19 16:39:45 2017 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Aug 19 16:39:45 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e752962
dev-util/qbs: backport upstream patch to install missing header
Gentoo-Bug: 625640
Package-Manager: Portage-2.3.8, Repoman-2.3.3
| 52 +++++++++
dev-util/qbs/qbs-1.8.1-r1.ebuild | 120 +++++++++++++++++++++
2 files changed, 172 insertions(+)
--git a/dev-util/qbs/files/1.8.1-Install-missing-public-header.patch b/dev-util/qbs/files/1.8.1-Install-missing-public-header.patch
new file mode 100644
index 00000000000..09aa6aec519
--- /dev/null
+++ b/dev-util/qbs/files/1.8.1-Install-missing-public-header.patch
@@ -0,0 +1,52 @@
+From 4143de9ab93283c6331418610902da4648db5b67 Mon Sep 17 00:00:00 2001
+From: Joerg Bornemann <joerg.bornemann@qt.io>
+Date: Mon, 10 Jul 2017 09:49:19 +0200
+Subject: [PATCH] Install missing public header
+
+Since commit 7ccc08f3, tools/version.h is needed by a public header.
+It must be installed.
+
+Change-Id: I79cb243463abb9390a581144467b3cd89f46eadd
+Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
+---
+ src/lib/corelib/corelib.qbs | 2 +-
+ src/lib/corelib/tools/tools.pri | 3 ++-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/lib/corelib/corelib.qbs b/src/lib/corelib/corelib.qbs
+index 1b137925..6dd6f082 100644
+--- a/src/lib/corelib/corelib.qbs
++++ b/src/lib/corelib/corelib.qbs
+@@ -405,7 +405,6 @@ QbsLibrary {
+ "stlutils.h",
+ "toolchains.cpp",
+ "version.cpp",
+- "version.h",
+ "visualstudioversioninfo.cpp",
+ "visualstudioversioninfo.h",
+ "vsenvironmentdetector.cpp",
+@@ -435,6 +434,7 @@ QbsLibrary {
+ "settingsmodel.h",
+ "setupprojectparameters.h",
+ "toolchains.h",
++ "version.h",
+ ]
+ qbs.install: qbsbuildconfig.installApiHeaders
+ qbs.installDir: headerInstallPrefix + "/tools"
+diff --git a/src/lib/corelib/tools/tools.pri b/src/lib/corelib/tools/tools.pri
+index 0fa91147..fb0c225b 100644
+--- a/src/lib/corelib/tools/tools.pri
++++ b/src/lib/corelib/tools/tools.pri
+@@ -125,7 +125,8 @@ qbs_enable_unit_tests {
+ $$PWD/generatorpluginmanager.h \
+ $$PWD/installoptions.h \
+ $$PWD/setupprojectparameters.h \
+- $$PWD/toolchains.h
++ $$PWD/toolchains.h \
++ $$PWD/version.h
+ tools_headers.path = $${QBS_INSTALL_PREFIX}/include/qbs/tools
+ INSTALLS += tools_headers
+ }
+--
+2.14.1
+
diff --git a/dev-util/qbs/qbs-1.8.1-r1.ebuild b/dev-util/qbs/qbs-1.8.1-r1.ebuild
new file mode 100644
index 00000000000..434c804c9c8
--- /dev/null
+++ b/dev-util/qbs/qbs-1.8.1-r1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit qmake-utils
+
+MY_P=${PN}-src-${PV}
+
+DESCRIPTION="Modern build tool for software projects"
+HOMEPAGE="https://wiki.qt.io/Qbs"
+SRC_URI="http://download.qt.io/official_releases/${PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="|| ( LGPL-2.1 LGPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc examples test"
+
+# see bug 581874 for the qttest dep in RDEPEND
+RDEPEND="
+ dev-qt/qtcore:5=
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtscript:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ test? ( dev-qt/qttest:5 )
+"
+DEPEND="${RDEPEND}
+ doc? (
+ dev-qt/qdoc:5
+ dev-qt/qthelp:5
+ )
+ test? ( dev-qt/qtdeclarative:5 )
+"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+ # bug 625640
+ "${FILESDIR}/1.8.1-Install-missing-public-header.patch"
+)
+
+src_prepare() {
+ default
+
+ # don't add /usr/include to INCLUDEPATH
+ # avoids a build failure in qt-creator with gcc-6 (bug 618424)
+ sed -i -e '/^INCLUDEPATH/ s:$${PWD}/\.\.::' src/lib/corelib/use_installed_corelib.pri || die
+
+ if ! use examples; then
+ sed -i -e '/INSTALLS +=/ s:examples::' static.pro || die
+ fi
+
+ if use test; then
+ sed -i -e '/SUBDIRS =/ s:=.*:= auto:' tests/tests.pro || die
+ else
+ sed -i -e '/SUBDIRS =/ d' tests/tests.pro || die
+ fi
+
+ # skip several tests that fail and/or have additional deps
+ sed -i \
+ -e 's/findArchiver("7z")/""/' `# requires p7zip, fails` \
+ -e 's/findArchiver(binaryName,.*/"";/' `# requires zip and jar` \
+ -e 's/p\.value("nodejs\./true||&/' `# requires nodejs, bug 527652` \
+ -e 's/\(p\.value\|m_qbsStderr\.contains\)("typescript\./true||&/' `# requires nodejs and typescript` \
+ tests/auto/blackbox/tst_blackbox.cpp || die
+
+ # requires jdk, fails, bug 585398
+ sed -i -e '/blackbox-java\.pro/ d' tests/auto/auto.pro || die
+}
+
+src_configure() {
+ local myqmakeargs=(
+ qbs.pro # bug 523218
+ -recursive
+ CONFIG+=qbs_disable_rpath
+ CONFIG+=qbs_enable_project_file_updates
+ $(usex test 'CONFIG+=qbs_enable_unit_tests' '')
+ QBS_INSTALL_PREFIX="${EPREFIX}/usr"
+ QBS_LIBRARY_DIRNAME="$(get_libdir)"
+ )
+ eqmake5 "${myqmakeargs[@]}"
+}
+
+src_test() {
+ einfo "Setting up test environment in ${T}"
+
+ export HOME=${T}
+ export LD_LIBRARY_PATH=${S}/$(get_libdir)
+
+ "${S}"/bin/qbs-setup-toolchains /usr/bin/gcc gcc || die
+ "${S}"/bin/qbs-setup-qt "$(qt5_get_bindir)/qmake" qbs_autotests || die
+
+ einfo "Running autotests"
+
+ # simply exporting LD_LIBRARY_PATH doesn't work
+ # we have to use a custom testrunner script
+ local testrunner=${WORKDIR}/gentoo-testrunner
+ cat <<-EOF > "${testrunner}"
+ #!/bin/sh
+ export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}\${LD_LIBRARY_PATH:+:}\${LD_LIBRARY_PATH}"
+ exec "\$@"
+ EOF
+ chmod +x "${testrunner}"
+
+ emake TESTRUNNER="'${testrunner}'" check
+}
+
+src_install() {
+ emake INSTALL_ROOT="${D}" install
+
+ # install documentation
+ if use doc; then
+ emake docs
+ dodoc -r doc/qbs/html
+ dodoc doc/qbs.qch
+ docompress -x /usr/share/doc/${PF}/qbs.qch
+ fi
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/files/, dev-util/qbs/
@ 2018-01-23 23:06 Davide Pesavento
0 siblings, 0 replies; 5+ messages in thread
From: Davide Pesavento @ 2018-01-23 23:06 UTC (permalink / raw
To: gentoo-commits
commit: ceb6ee8c339cf48bae37e17551e4095ec6a2fd3e
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 23 23:05:55 2018 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Jan 23 23:06:27 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ceb6ee8c
dev-util/qbs: remove 1.8.1-r1
x86 is demoted to ~arch
Package-Manager: Portage-2.3.20, Repoman-2.3.6
dev-util/qbs/Manifest | 1 -
| 52 ---------
dev-util/qbs/qbs-1.8.1-r1.ebuild | 120 ---------------------
3 files changed, 173 deletions(-)
diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index cd1b6823d11..7c82dec9a4c 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1,3 +1,2 @@
DIST qbs-src-1.10.0.tar.gz 4130630 BLAKE2B 9a692dc3cd65cbe8b8f09ca86e8da1ea47fa6770dbcdfc5fc34d65156f8a92932893fa382f510e516fe67a77b95024052d442d3e295a22423a544b61ff2eaf25 SHA512 a7d15acb46b5b32f0c54b40e4a5469f68cdcff54b062a46656174694d7abbade682b66f5dc4cdfa9ac87b9573ed3947d775d55638cfc1b4ffc24101ebea85618
-DIST qbs-src-1.8.1.tar.gz 1053395 BLAKE2B 1ec3840c206ec253779f016f9bdc2b806007cc0774442e2bf75a62c3148771fcf356d14c7743c1aefcbda0379f632ddaa309f48b7998387b8c37649fdf750d06 SHA512 2b4657475803e56f911f0bc373692b70f9376ed520499f1c4e7040e4dedddc417bd4e72208c925ed7fdc7fcf0b96434dab8d8f87c454ae08da80d6438dbcbc5c
DIST qbs-src-1.9.1.tar.gz 4007946 BLAKE2B fa7744a321fec2f7b928b89e511aa542d935a61af79714d730e0c4c5fdab1f62e0da5cccf055622997cfbe441e5375212aa9cd8af3b1d69af933c438c94b8d21 SHA512 6b400a06b4f2c2cb531095a0c3eadb112335fe0f91c2077f01c7d2dc6ea329d250e7af70f70ebeb972368aa8fa0ee9548b84b75dc877230de6dea0b10468b7fd
diff --git a/dev-util/qbs/files/1.8.1-Install-missing-public-header.patch b/dev-util/qbs/files/1.8.1-Install-missing-public-header.patch
deleted file mode 100644
index 09aa6aec519..00000000000
--- a/dev-util/qbs/files/1.8.1-Install-missing-public-header.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 4143de9ab93283c6331418610902da4648db5b67 Mon Sep 17 00:00:00 2001
-From: Joerg Bornemann <joerg.bornemann@qt.io>
-Date: Mon, 10 Jul 2017 09:49:19 +0200
-Subject: [PATCH] Install missing public header
-
-Since commit 7ccc08f3, tools/version.h is needed by a public header.
-It must be installed.
-
-Change-Id: I79cb243463abb9390a581144467b3cd89f46eadd
-Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
----
- src/lib/corelib/corelib.qbs | 2 +-
- src/lib/corelib/tools/tools.pri | 3 ++-
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/lib/corelib/corelib.qbs b/src/lib/corelib/corelib.qbs
-index 1b137925..6dd6f082 100644
---- a/src/lib/corelib/corelib.qbs
-+++ b/src/lib/corelib/corelib.qbs
-@@ -405,7 +405,6 @@ QbsLibrary {
- "stlutils.h",
- "toolchains.cpp",
- "version.cpp",
-- "version.h",
- "visualstudioversioninfo.cpp",
- "visualstudioversioninfo.h",
- "vsenvironmentdetector.cpp",
-@@ -435,6 +434,7 @@ QbsLibrary {
- "settingsmodel.h",
- "setupprojectparameters.h",
- "toolchains.h",
-+ "version.h",
- ]
- qbs.install: qbsbuildconfig.installApiHeaders
- qbs.installDir: headerInstallPrefix + "/tools"
-diff --git a/src/lib/corelib/tools/tools.pri b/src/lib/corelib/tools/tools.pri
-index 0fa91147..fb0c225b 100644
---- a/src/lib/corelib/tools/tools.pri
-+++ b/src/lib/corelib/tools/tools.pri
-@@ -125,7 +125,8 @@ qbs_enable_unit_tests {
- $$PWD/generatorpluginmanager.h \
- $$PWD/installoptions.h \
- $$PWD/setupprojectparameters.h \
-- $$PWD/toolchains.h
-+ $$PWD/toolchains.h \
-+ $$PWD/version.h
- tools_headers.path = $${QBS_INSTALL_PREFIX}/include/qbs/tools
- INSTALLS += tools_headers
- }
---
-2.14.1
-
diff --git a/dev-util/qbs/qbs-1.8.1-r1.ebuild b/dev-util/qbs/qbs-1.8.1-r1.ebuild
deleted file mode 100644
index 4cad93eff2c..00000000000
--- a/dev-util/qbs/qbs-1.8.1-r1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils
-
-MY_P=${PN}-src-${PV}
-
-DESCRIPTION="Modern build tool for software projects"
-HOMEPAGE="https://wiki.qt.io/Qbs"
-SRC_URI="http://download.qt.io/official_releases/${PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="doc examples test"
-
-# see bug 581874 for the qttest dep in RDEPEND
-RDEPEND="
- dev-qt/qtcore:5=
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtscript:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- test? ( dev-qt/qttest:5 )
-"
-DEPEND="${RDEPEND}
- doc? (
- dev-qt/qdoc:5
- dev-qt/qthelp:5
- )
- test? ( dev-qt/qtdeclarative:5 )
-"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
- # bug 625640
- "${FILESDIR}/1.8.1-Install-missing-public-header.patch"
-)
-
-src_prepare() {
- default
-
- # don't add /usr/include to INCLUDEPATH
- # avoids a build failure in qt-creator with gcc-6 (bug 618424)
- sed -i -e '/^INCLUDEPATH/ s:$${PWD}/\.\.::' src/lib/corelib/use_installed_corelib.pri || die
-
- if ! use examples; then
- sed -i -e '/INSTALLS +=/ s:examples::' static.pro || die
- fi
-
- if use test; then
- sed -i -e '/SUBDIRS =/ s:=.*:= auto:' tests/tests.pro || die
- else
- sed -i -e '/SUBDIRS =/ d' tests/tests.pro || die
- fi
-
- # skip several tests that fail and/or have additional deps
- sed -i \
- -e 's/findArchiver("7z")/""/' `# requires p7zip, fails` \
- -e 's/findArchiver(binaryName,.*/"";/' `# requires zip and jar` \
- -e 's/p\.value("nodejs\./true||&/' `# requires nodejs, bug 527652` \
- -e 's/\(p\.value\|m_qbsStderr\.contains\)("typescript\./true||&/' `# requires nodejs and typescript` \
- tests/auto/blackbox/tst_blackbox.cpp || die
-
- # requires jdk, fails, bug 585398
- sed -i -e '/blackbox-java\.pro/ d' tests/auto/auto.pro || die
-}
-
-src_configure() {
- local myqmakeargs=(
- qbs.pro # bug 523218
- -recursive
- CONFIG+=qbs_disable_rpath
- CONFIG+=qbs_enable_project_file_updates
- $(usex test 'CONFIG+=qbs_enable_unit_tests' '')
- QBS_INSTALL_PREFIX="${EPREFIX}/usr"
- QBS_LIBRARY_DIRNAME="$(get_libdir)"
- )
- eqmake5 "${myqmakeargs[@]}"
-}
-
-src_test() {
- einfo "Setting up test environment in ${T}"
-
- export HOME=${T}
- export LD_LIBRARY_PATH=${S}/$(get_libdir)
-
- "${S}"/bin/qbs-setup-toolchains /usr/bin/gcc gcc || die
- "${S}"/bin/qbs-setup-qt "$(qt5_get_bindir)/qmake" qbs_autotests || die
-
- einfo "Running autotests"
-
- # simply exporting LD_LIBRARY_PATH doesn't work
- # we have to use a custom testrunner script
- local testrunner=${WORKDIR}/gentoo-testrunner
- cat <<-EOF > "${testrunner}"
- #!/bin/sh
- export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}\${LD_LIBRARY_PATH:+:}\${LD_LIBRARY_PATH}"
- exec "\$@"
- EOF
- chmod +x "${testrunner}"
-
- emake TESTRUNNER="'${testrunner}'" check
-}
-
-src_install() {
- emake INSTALL_ROOT="${D}" install
-
- # install documentation
- if use doc; then
- emake docs
- dodoc -r doc/qbs/html
- dodoc doc/qbs.qch
- docompress -x /usr/share/doc/${PF}/qbs.qch
- fi
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/files/, dev-util/qbs/
@ 2024-05-08 18:43 Ionen Wolkens
0 siblings, 0 replies; 5+ messages in thread
From: Ionen Wolkens @ 2024-05-08 18:43 UTC (permalink / raw
To: gentoo-commits
commit: 71e925a3cc39458ac21caf651460744649d88b20
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed May 8 17:26:45 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed May 8 18:42:56 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71e925a3
dev-util/qbs: prevent auto-selecting Qt version
DISABLE_FIND behaves badly here between being either
unused or preventing the fallback.
It normally tries Qt6 first, but given #931596 somehow
picked it despite qtbase:6 being installed and seemingly
not broken (given it built other Qt6 packages), let's
make sure.
May not necessarily fix #931596 but if whatever happened
happens again, there should be a more interesting output.
Doesn't hurt to ensure it won't ever pick Qt5 either way
to ensure it doesn't successfully build if Qt6 had issues.
Closes: https://bugs.gentoo.org/931596
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-util/qbs/files/qbs-2.3.1-qtver.patch | 9 +++++++++
dev-util/qbs/qbs-2.3.1.ebuild | 5 +++++
2 files changed, 14 insertions(+)
diff --git a/dev-util/qbs/files/qbs-2.3.1-qtver.patch b/dev-util/qbs/files/qbs-2.3.1-qtver.patch
new file mode 100644
index 000000000000..3117c432c544
--- /dev/null
+++ b/dev-util/qbs/files/qbs-2.3.1-qtver.patch
@@ -0,0 +1,9 @@
+https://bugs.gentoo.org/931596
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -29,3 +29,5 @@
+
++if (NOT DEFINED QT_VERSION_MAJOR)
+ find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED)
++endif()
+
diff --git a/dev-util/qbs/qbs-2.3.1.ebuild b/dev-util/qbs/qbs-2.3.1.ebuild
index c00fae7ed834..ed014f09332d 100644
--- a/dev-util/qbs/qbs-2.3.1.ebuild
+++ b/dev-util/qbs/qbs-2.3.1.ebuild
@@ -43,6 +43,10 @@ CMAKE_SKIP_TESTS=(
tst_language
)
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.3.1-qtver.patch
+)
+
python_check_deps() {
# _find_python_module in cmake/QbsDocumentation.cmake
python_has_version "dev-python/beautifulsoup4[${PYTHON_USEDEP}]" &&
@@ -64,6 +68,7 @@ src_configure() {
-DQBS_INSTALL_MAN_PAGE=yes
-DQBS_INSTALL_QCH_DOCS=$(usex doc)
-DQBS_LIB_INSTALL_DIR="$(get_libdir)"
+ -DQT_VERSION_MAJOR=6 #931596
-DWITH_TESTS=$(usex test)
-DWITH_UNIT_TESTS=$(usex test)
)
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/files/, dev-util/qbs/
@ 2024-09-13 23:25 Ionen Wolkens
0 siblings, 0 replies; 5+ messages in thread
From: Ionen Wolkens @ 2024-09-13 23:25 UTC (permalink / raw
To: gentoo-commits
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/files/, dev-util/qbs/
@ 2024-09-13 23:25 Ionen Wolkens
0 siblings, 0 replies; 5+ messages in thread
From: Ionen Wolkens @ 2024-09-13 23:25 UTC (permalink / raw
To: gentoo-commits
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() {
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-09-13 23:25 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-09-13 23:25 [gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/files/, dev-util/qbs/ Ionen Wolkens
-- strict thread matches above, loose matches on Subject: below --
2024-09-13 23:25 Ionen Wolkens
2024-05-08 18:43 Ionen Wolkens
2018-01-23 23:06 Davide Pesavento
2017-08-19 17:15 Davide Pesavento
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox