dev-qt/qtcore: Fix configure w/ slibtool

Closes: https://bugs.gentoo.org/792804
Package-Manager: Portage-3.0.32, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
Andreas Sturmlechner
2022-07-17 17:57:54 +02:00
parent 3834431f61
commit c485947394
2 changed files with 31 additions and 0 deletions

View File

@@ -0,0 +1,29 @@
From beebf54552e85c07496aa748710df76131620834 Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Sun, 17 Jul 2022 17:43:27 +0200
Subject: [PATCH] Remove quoting around $MAKE call
Fixes build with e.g. MAKE='make libtool=...'
Gentoo-bug: https://bugs.gentoo.org/792804
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
---
configure | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure b/configure
index b6c9b462..096706b0 100755
--- a/configure
+++ b/configure
@@ -795,7 +795,7 @@ setBootstrapVariable()
if [ "$OPT_VERBOSE" = yes ]; then
# Show the output of make
- (cd "$outpath/qmake"; "$MAKE") || exit 2
+ (cd "$outpath/qmake"; $MAKE) || exit 2
else
# Hide the output of make
# Use bash to print dots, if we have it, and stdout is a tty.
--
2.35.1

View File

@@ -61,6 +61,8 @@ src_prepare() {
# fix missing qt_version_tag symbol w/ LTO, bug 674382
sed -i -e 's/^gcc:ltcg/gcc/' src/corelib/global/global.pri || die
eapply "${FILESDIR}/${P}-slibtool.patch" # bug 792804, TODO: merge into _QT5_GENTOOPATCHSET_REV
qt5-build_src_prepare
}