media-sound/guitarix: restore parallel build

Build system messes with the build jobs count, so that waf build always respects the number of jobs passed to waf configure. And since waf-utils eclass passes --jobs=1 to waf configure, we are always building using only 1 job. Pass --jobs with the correct number of jobs to waf configure as a workaround. Closes: https://bugs.gentoo.org/908690 Signed-off-by: Alexander Tsoy <[email protected]> Closes: gentoo#34639 Signed-off-by: Miroslav Šulc <[email protected]>
johu · Jan 5, 2024 · b1d7684 · b1d7684
1 parent 7d31d19
commit b1d7684
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/...itarix/files/guitarix-0.41.0-py3.11.patch → ...itarix/files/guitarix-0.44.1-py3.11.patch b/...itarix/files/guitarix-0.41.0-py3.11.patch → ...itarix/files/guitarix-0.44.1-py3.11.patch
diff --git a/media-sound/guitarix/guitarix-0.44.1.ebuild b/media-sound/guitarix/guitarix-0.44.1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 PYTHON_COMPAT=( python3_{9..11} )
 PYTHON_REQ_USE='threads(+)'
 
-inherit python-any-r1 waf-utils xdg
+inherit multiprocessing python-any-r1 waf-utils xdg
 
 DESCRIPTION="Virtual guitar amplifier for Linux"
 HOMEPAGE="https://guitarix.org/"
@@ -63,8 +63,8 @@ DOCS=( changelog README )
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.41.0-nostrip.patch
-	"${FILESDIR}"/${PN}-0.41.0-py3.11.patch
-	"${FILESDIR}"/${PN}-0.44.1-zita-resampler-1.10.patch
+	"${FILESDIR}"/${P}-py3.11.patch
+	"${FILESDIR}"/${P}-zita-resampler-1.10.patch
 	"${FILESDIR}"/${P}-gcc-13.patch
 )
 
@@ -82,6 +82,7 @@ src_configure() {
 		--no-faust
 		--no-ldconfig
 		--shared-lib
+		--jobs=$(makeopts_jobs)
 		$(use_enable nls)
 		$(usex bluetooth "" "--no-bluez")
 		$(usex debug "--debug" "")

diff --git a/media-sound/guitarix/guitarix-9999.ebuild b/media-sound/guitarix/guitarix-9999.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE='threads(+)'
 EGIT_OVERRIDE_REPO_ENYOJS_BOOTPLATE="https://github.com/enyojs/bootplate.git"
 EGIT_OVERRIDE_BRANCH_ENYOJS_BOOTPLATE="master"
 
-inherit python-any-r1 waf-utils xdg git-r3
+inherit multiprocessing python-any-r1 waf-utils xdg git-r3
 
 DESCRIPTION="Virtual guitar amplifier for Linux"
 HOMEPAGE="https://guitarix.org/"
@@ -79,6 +79,7 @@ src_configure() {
 		--no-faust
 		--no-ldconfig
 		--shared-lib
+		--jobs=$(makeopts_jobs)
 		$(use_enable nls)
 		$(usex bluetooth "" "--no-bluez")
 		$(usex debug "--debug" "")