From 5a4038a7a205003bed91751fde423bfb81ee444f Mon Sep 17 00:00:00 2001 From: Arno Rehn Date: Tue, 29 Jul 2014 19:49:57 +0200 Subject: [PATCH] Pass the library dirs along to find_library to fix cmake/qt5 builds --- extra/qt5/PKGBUILD | 2 +- extra/qt5/rpi.patch | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/extra/qt5/PKGBUILD b/extra/qt5/PKGBUILD index ee6156e18..2b29941c2 100644 --- a/extra/qt5/PKGBUILD +++ b/extra/qt5/PKGBUILD @@ -58,7 +58,7 @@ md5sums=('f9a24a0d5645efa0715b6ff0fa13d60f' '188da8f4c87316e730ebf1c6217bf5a0' '322b419b16c75d4de0ee7ad0a246caa1' 'a378deccf363bd6079da459c89aff7b9' - '8df638e1dbf41617ffb0827978b54c8e' + '762b33b1b083c0d19ccbd1ac2b9eb5c7' 'd9eb94a6cf4f178a7d77d6b8a9280ee2') prepare() { diff --git a/extra/qt5/rpi.patch b/extra/qt5/rpi.patch index c96353b91..d79b8d002 100644 --- a/extra/qt5/rpi.patch +++ b/extra/qt5/rpi.patch @@ -32,3 +32,15 @@ if compileTest qpa/egl "EGL" $QMAKE_CFLAGS_EGL $QMAKE_LIBS_EGL; then CFG_EGL=yes if compileTest qpa/egl-x11 "EGL-X11" $QMAKE_CFLAGS_EGL $QMAKE_LIBS_EGL; then +--- qt-everywhere-opensource-src-5.3.1/qtbase/src/gui/Qt5GuiConfigExtras.cmake.in.orig 2014-07-29 19:23:45.000000000 +0200 ++++ qt-everywhere-opensource-src-5.3.1/qtbase/src/gui/Qt5GuiConfigExtras.cmake.in 2014-07-29 19:41:12.000000000 +0200 +@@ -96,8 +96,8 @@ + string(REGEX REPLACE "[^_A-Za-z0-9]" "_" _cmake_lib_name ${_lib}) + if (NOT TARGET Qt5::Gui_${_cmake_lib_name} AND NOT _Qt5Gui_${_cmake_lib_name}_LIBRARY_DONE) + find_library(Qt5Gui_${_cmake_lib_name}_LIBRARY ${_lib} ++ HINTS \"${LibDir}\" + !!IF !isEmpty(CROSS_COMPILE) +- PATHS \"${LibDir}\" + !!IF !mac + NO_DEFAULT_PATH + !!ENDIF