aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2019-09-23 20:27:06 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2019-09-23 20:27:06 +0200
commitafbfb79dbd88738e4299f3a20e1622b886dcd9da (patch)
treee6247991854a351e6c586bfd2dbef92584cc3fa4
parentdev-qt/qtwidgets: adjust xcb configure options for 5.15 (diff)
downloadqt-afbfb79dbd88738e4299f3a20e1622b886dcd9da.tar.gz
qt-afbfb79dbd88738e4299f3a20e1622b886dcd9da.tar.bz2
qt-afbfb79dbd88738e4299f3a20e1622b886dcd9da.zip
dev-qt/qtcore: Fix hardcoded libdir path in some *.cmake configs
Thanks-to: Manuel Nickschas <sputnick@quassel-irc.org> Closes: https://bugs.gentoo.org/691462 Package-Manager: Portage-2.3.76, Repoman-2.3.17 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
-rw-r--r--dev-qt/qtcore/files/qtcore-5.13.1-Qt5BasicConfig-fix-libdir.patch38
-rw-r--r--dev-qt/qtcore/qtcore-5.13.1.ebuild4
2 files changed, 42 insertions, 0 deletions
diff --git a/dev-qt/qtcore/files/qtcore-5.13.1-Qt5BasicConfig-fix-libdir.patch b/dev-qt/qtcore/files/qtcore-5.13.1-Qt5BasicConfig-fix-libdir.patch
new file mode 100644
index 00000000..49b936f5
--- /dev/null
+++ b/dev-qt/qtcore/files/qtcore-5.13.1-Qt5BasicConfig-fix-libdir.patch
@@ -0,0 +1,38 @@
+From cc32a691936f37eaaec618a71edd62f896009c9d Mon Sep 17 00:00:00 2001
+From: Joerg Bornemann <joerg.bornemann@qt.io>
+Date: Fri, 6 Sep 2019 10:54:44 +0200
+Subject: [PATCH] Fix CMake config files for -libdir different from "lib"
+
+When Qt was configured with -libdir different from "lib", one could not
+build with CMake whenever a static lib was pulled in (e.g. uitools).
+
+Do not hard-code "/lib" but use the correct variable also for static
+libraries.
+
+Fixes: QTBUG-76255
+Change-Id: I28c6861752e29e461247628d2b1f8a9ec32f0790
+Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
+Reviewed-by: Fabian Vogt <fabian@ritter-vogt.de>
+---
+ mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+index d4fd057682d..f4a34d6e481 100644
+--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
++++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+@@ -53,7 +53,11 @@ function(_qt5_$${CMAKE_MODULE_NAME}_process_prl_file prl_file_location Configura
+ set(_lib_deps)
+ set(_link_flags)
+
+- get_filename_component(_qt5_install_libs \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/lib\" ABSOLUTE)
++!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
++ set(_qt5_install_libs \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}\")
++!!ELSE
++ set(_qt5_install_libs \"$${CMAKE_LIB_DIR}\")
++!!ENDIF
+
+ if(EXISTS \"${prl_file_location}\")
+ file(STRINGS \"${prl_file_location}\" _prl_strings REGEX \"QMAKE_PRL_LIBS_FOR_CMAKE[ \\t]*=\")
+--
+2.16.3
diff --git a/dev-qt/qtcore/qtcore-5.13.1.ebuild b/dev-qt/qtcore/qtcore-5.13.1.ebuild
index d881786f..28ff5c1c 100644
--- a/dev-qt/qtcore/qtcore-5.13.1.ebuild
+++ b/dev-qt/qtcore/qtcore-5.13.1.ebuild
@@ -43,6 +43,10 @@ QT5_GENTOO_PRIVATE_CONFIG=(
!:xml
)
+PATCHES=(
+ "${FILESDIR}/${P}-Qt5BasicConfig-fix-libdir.patch" # QTBUG-76255, bug #691462
+)
+
src_prepare() {
# don't add -O3 to CXXFLAGS, bug 549140
sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/corelib/corelib.pro || die