wxwidgets: fix multilib issue when build with webkit
PATCH 1/1 wxwidgets: fix multilib issue when build with webkit
From: Kai Kang <[email protected]>
When packageconfig 'webkit' is enabled, it installs library to bare 'lib' dir and causes 'installed-vs-shipped' issue:
| ERROR: wxwidgets-3.1.5-r0 do_package: QA Issue: wxwidgets:
Files/directories were installed but not shipped in any package:
| /usr/lib/wx/3.1.5/web-extensions/webkit2_extud-3.1.so
Respect ${wxPLATFORM_LIB_DIR} to fix the issue.
Signed-off-by Kai Kang <[email protected]>
--- .../wxwidgets/fix-libdir-for-multilib.patch | 29 +++++++++++++++---- 1 file changed, 23 insertions(+), 6 deletions(-)
meta-oe/recipes-extended/wxwidgets/wxwidgets/fix-libdir-for-multilib.patch +23 -6
@@ -5,11 +5,12 @@ Upstream-Status: Pending Signed-off-by: Kai Kang <[email protected]> --- - CMakeLists.txt | 2 +- - build/cmake/config.cmake | 2 +- - build/cmake/functions.cmake | 6 +++--- - build/cmake/install.cmake | 6 +++--- - 4 files changed, 8 insertions(+), 8 deletions(-) + CMakeLists.txt | 2 +- + build/cmake/config.cmake | 2 +- + build/cmake/functions.cmake | 6 +++--- + build/cmake/install.cmake | 6 +++--- + build/cmake/lib/webview/CMakeLists.txt | 4 ++-- + 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4063020552..253d415210 100644
@@ -38,7 +39,7 @@ index 91d11acba2..f361d50a27 100644 ) endfunction() diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake -index c33dd3946c..51e47e05b3 100644 +index 5597e46a67..53cd6a1ace 100644 --- a/build/cmake/functions.cmake +++ b/build/cmake/functions.cmake @@ -78,9 +78,9 @@ function(wx_set_common_target_properties target_name)
@@ -81,3 +82,19 @@ index 968dff859e..c850c51844 100644 ${CMAKE_INSTALL_PREFIX}/bin/wx-config \ )" ) +diff --git a/build/cmake/lib/webview/CMakeLists.txt b/build/cmake/lib/webview/CMakeLists.txt +index cc3298ff33..36b190d2bc 100644 +--- a/build/cmake/lib/webview/CMakeLists.txt ++++ b/build/cmake/lib/webview/CMakeLists.txt +@@ -45,9 +45,9 @@ wx_add_library(wxwebview ${WEBVIEW_FILES}) + + if(WXGTK AND wxUSE_WEBVIEW_WEBKIT2) + if(wxVERSION_IS_DEV) +- set(WX_WEB_EXTENSIONS_DIRECTORY "lib/wx/${wxMAJOR_VERSION}.${wxMINOR_VERSION}.${wxRELEASE_NUMBER}/web-extensions") ++ set(WX_WEB_EXTENSIONS_DIRECTORY "lib${wxPLATFORM_LIB_DIR}/wx/${wxMAJOR_VERSION}.${wxMINOR_VERSION}.${wxRELEASE_NUMBER}/web-extensions") + else() +- set(WX_WEB_EXTENSIONS_DIRECTORY "lib/wx/${wxMAJOR_VERSION}.${wxMINOR_VERSION}/web-extensions") ++ set(WX_WEB_EXTENSIONS_DIRECTORY "lib${wxPLATFORM_LIB_DIR}/wx/${wxMAJOR_VERSION}.${wxMINOR_VERSION}/web-extensions") + endif() + endif() +
Signature · 1 line
2.17.1