mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-01-12 03:24:08 +00:00
Code Issues Projects Releases Wiki Activity

wxwidgets: fix for multilib

Browse Source 
In case of multilib enabled, we'll get installed-vs-shipped QA
error. This is because the hardcoded/default '/lib' is used.

Update 0002-fix-libdir-for-multilib.patch and set wxBUILD_INSTALL_xxx
variables to fix this issue.

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Chen Qi
2025-07-20 20:02:14 -07:00
committed by Khem Raj
parent f4bd933b30
commit ac6f7c3665
2 changed files with 32 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
meta-oe/recipes-extended/wxwidgets/wxwidgets/0002-fix-libdir-for-multilib.patch
View File

@@ -1,4 +1,4 @@
From 9487fe5cd271a4bee96ab590509ef38f6972887a Mon Sep 17 00:00:00 2001
From 42b1d9e8138b8b4f7160f208a5d15fe25d0223a3 Mon Sep 17 00:00:00 2001
From: Kai Kang <kai.kang@windriver.com>
Date: Sat, 12 Oct 2024 18:43:25 +0800
Subject: [PATCH] fix libdir for multilib
@@ -16,15 +16,17 @@ in this patch that LIB_SUFFIX has been passed to cmake in cmake.bbclass.
Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
CMakeLists.txt | 2 +-
build/cmake/config.cmake | 2 +-
build/cmake/functions.cmake | 4 ++--
build/cmake/install.cmake | 12 ++++++------
4 files changed, 10 insertions(+), 10 deletions(-)
CMakeLists.txt | 2 +-
build/cmake/config.cmake | 2 +-
build/cmake/install.cmake | 12 ++++++------
build/cmake/lib/webview/CMakeLists.txt | 2 +-
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d6a4b49..9e86b87 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,7 +43,7 @@ include(build/cmake/policies.cmake NO_PO
@@ -43,7 +43,7 @@ include(build/cmake/policies.cmake NO_POLICY_SCOPE)
# Initialize variables for quick access to wx root dir in sub dirs
set(wxSOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
set(wxBINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
@@ -33,6 +35,8 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com>
# parse the version number from wx/version.h and include in wxMAJOR_VERSION and wxMINOR_VERSION
file(READ "${wxSOURCE_DIR}/include/wx/version.h" WX_VERSION_H_CONTENTS)
diff --git a/build/cmake/config.cmake b/build/cmake/config.cmake
index addd8d6..9ec6775 100644
--- a/build/cmake/config.cmake
+++ b/build/cmake/config.cmake
@@ -100,7 +100,7 @@ function(wx_write_config_inplace)
@@ -44,6 +48,8 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com>
"${wxBINARY_DIR}/wx-config"
)
endfunction()
diff --git a/build/cmake/install.cmake b/build/cmake/install.cmake
index 202d054..e255e0b 100644
--- a/build/cmake/install.cmake
+++ b/build/cmake/install.cmake
@@ -44,11 +44,11 @@ if(WIN32_MSVC_NAMING)
@@ -90,3 +96,19 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com>
)
# uninstall target
diff --git a/build/cmake/lib/webview/CMakeLists.txt b/build/cmake/lib/webview/CMakeLists.txt
index 2cb35e7..7977a84 100644
--- a/build/cmake/lib/webview/CMakeLists.txt
+++ b/build/cmake/lib/webview/CMakeLists.txt
@@ -146,7 +146,7 @@ if(WXGTK AND wxUSE_WEBVIEW_WEBKIT2)
${WEBKIT2_LIBRARIES}
)
- wx_install(TARGETS wxwebkit2_ext LIBRARY DESTINATION "lib/wx/${WX_WEB_EXT_VERSION}/web-extensions")
+ wx_install(TARGETS wxwebkit2_ext LIBRARY DESTINATION "lib${LIB_SUFFIX}/wx/${WX_WEB_EXT_VERSION}/web-extensions")
wx_add_dependencies(wxwebview wxwebkit2_ext)
endif()
--
2.49.0

3
meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.8.bb
View File

@@ -40,6 +40,9 @@ EXTRA_OECMAKE += " \
-DwxUSE_LIBPNG=sys \
-DwxUSE_LIBTIFF=sys \
-DwxUSE_REGEX=builtin \
-DwxBUILD_INSTALL_RUNTIME_DIR=${libdir} \
-DwxBUILD_INSTALL_LIBRARY_DIR=${libdir} \
-DwxBUILD_INSTALL_PLATFORM_SUBDIR=${libdir} \
"
EXTRA_OECMAKE:append:class-target = ' -DEGREP="/bin/grep -E"'