diff options
Diffstat (limited to 'meta-oe/recipes-extended')
-rw-r--r--[-rwxr-xr-x] | meta-oe/recipes-extended/valkey/valkey/init-valkey-server | 0 | ||||
-rw-r--r-- | meta-oe/recipes-extended/valkey/valkey_8.1.3.bb (renamed from meta-oe/recipes-extended/valkey/valkey_8.1.1.bb) | 5 | ||||
-rw-r--r-- | meta-oe/recipes-extended/wxwidgets/wxwidgets/0002-fix-libdir-for-multilib.patch | 36 | ||||
-rw-r--r-- | meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.8.bb | 3 |
4 files changed, 34 insertions, 10 deletions
diff --git a/meta-oe/recipes-extended/valkey/valkey/init-valkey-server b/meta-oe/recipes-extended/valkey/valkey/init-valkey-server index 8731795740..8731795740 100755..100644 --- a/meta-oe/recipes-extended/valkey/valkey/init-valkey-server +++ b/meta-oe/recipes-extended/valkey/valkey/init-valkey-server | |||
diff --git a/meta-oe/recipes-extended/valkey/valkey_8.1.1.bb b/meta-oe/recipes-extended/valkey/valkey_8.1.3.bb index 35b3d3c4a7..28b375bde2 100644 --- a/meta-oe/recipes-extended/valkey/valkey_8.1.1.bb +++ b/meta-oe/recipes-extended/valkey/valkey_8.1.3.bb | |||
@@ -17,15 +17,14 @@ SRC_URI = " \ | |||
17 | file://0001-src-Do-not-reset-FINAL_LIBS.patch \ | 17 | file://0001-src-Do-not-reset-FINAL_LIBS.patch \ |
18 | file://GNU_SOURCE-7.patch \ | 18 | file://GNU_SOURCE-7.patch \ |
19 | " | 19 | " |
20 | SRCREV = "fcd8bc3ee40f5d7841b7d5a8f3cd12252fec14e4" | 20 | SRCREV = "d063dff523340e5a075f7ddc436e0c2a43d04061" |
21 | |||
22 | 21 | ||
23 | RPROVIDES:${PN} = "virtual-redis" | 22 | RPROVIDES:${PN} = "virtual-redis" |
24 | 23 | ||
25 | inherit pkgconfig update-rc.d systemd useradd | 24 | inherit pkgconfig update-rc.d systemd useradd |
26 | 25 | ||
27 | FINAL_LIBS:x86:toolchain-clang = "-latomic" | 26 | FINAL_LIBS:x86:toolchain-clang = "-latomic" |
28 | FINAL_LIBS:riscv32:toolchain-clang = "-latomic" | 27 | FINAL_LIBS:riscv32 = "-latomic" |
29 | FINAL_LIBS:mips = "-latomic" | 28 | FINAL_LIBS:mips = "-latomic" |
30 | FINAL_LIBS:arm = "-latomic" | 29 | FINAL_LIBS:arm = "-latomic" |
31 | FINAL_LIBS:powerpc = "-latomic" | 30 | FINAL_LIBS:powerpc = "-latomic" |
diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets/0002-fix-libdir-for-multilib.patch b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0002-fix-libdir-for-multilib.patch index fe65dd2836..cd0417612f 100644 --- a/meta-oe/recipes-extended/wxwidgets/wxwidgets/0002-fix-libdir-for-multilib.patch +++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0002-fix-libdir-for-multilib.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 9487fe5cd271a4bee96ab590509ef38f6972887a Mon Sep 17 00:00:00 2001 | 1 | From 42b1d9e8138b8b4f7160f208a5d15fe25d0223a3 Mon Sep 17 00:00:00 2001 |
2 | From: Kai Kang <kai.kang@windriver.com> | 2 | From: Kai Kang <kai.kang@windriver.com> |
3 | Date: Sat, 12 Oct 2024 18:43:25 +0800 | 3 | Date: Sat, 12 Oct 2024 18:43:25 +0800 |
4 | Subject: [PATCH] fix libdir for multilib | 4 | Subject: [PATCH] fix libdir for multilib |
@@ -16,15 +16,17 @@ in this patch that LIB_SUFFIX has been passed to cmake in cmake.bbclass. | |||
16 | 16 | ||
17 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | 17 | Signed-off-by: Kai Kang <kai.kang@windriver.com> |
18 | --- | 18 | --- |
19 | CMakeLists.txt | 2 +- | 19 | CMakeLists.txt | 2 +- |
20 | build/cmake/config.cmake | 2 +- | 20 | build/cmake/config.cmake | 2 +- |
21 | build/cmake/functions.cmake | 4 ++-- | 21 | build/cmake/install.cmake | 12 ++++++------ |
22 | build/cmake/install.cmake | 12 ++++++------ | 22 | build/cmake/lib/webview/CMakeLists.txt | 2 +- |
23 | 4 files changed, 10 insertions(+), 10 deletions(-) | 23 | 4 files changed, 9 insertions(+), 9 deletions(-) |
24 | 24 | ||
25 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
26 | index d6a4b49..9e86b87 100644 | ||
25 | --- a/CMakeLists.txt | 27 | --- a/CMakeLists.txt |
26 | +++ b/CMakeLists.txt | 28 | +++ b/CMakeLists.txt |
27 | @@ -43,7 +43,7 @@ include(build/cmake/policies.cmake NO_PO | 29 | @@ -43,7 +43,7 @@ include(build/cmake/policies.cmake NO_POLICY_SCOPE) |
28 | # Initialize variables for quick access to wx root dir in sub dirs | 30 | # Initialize variables for quick access to wx root dir in sub dirs |
29 | set(wxSOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) | 31 | set(wxSOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) |
30 | set(wxBINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}) | 32 | set(wxBINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}) |
@@ -33,6 +35,8 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com> | |||
33 | 35 | ||
34 | # parse the version number from wx/version.h and include in wxMAJOR_VERSION and wxMINOR_VERSION | 36 | # parse the version number from wx/version.h and include in wxMAJOR_VERSION and wxMINOR_VERSION |
35 | file(READ "${wxSOURCE_DIR}/include/wx/version.h" WX_VERSION_H_CONTENTS) | 37 | file(READ "${wxSOURCE_DIR}/include/wx/version.h" WX_VERSION_H_CONTENTS) |
38 | diff --git a/build/cmake/config.cmake b/build/cmake/config.cmake | ||
39 | index addd8d6..9ec6775 100644 | ||
36 | --- a/build/cmake/config.cmake | 40 | --- a/build/cmake/config.cmake |
37 | +++ b/build/cmake/config.cmake | 41 | +++ b/build/cmake/config.cmake |
38 | @@ -100,7 +100,7 @@ function(wx_write_config_inplace) | 42 | @@ -100,7 +100,7 @@ function(wx_write_config_inplace) |
@@ -44,6 +48,8 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com> | |||
44 | "${wxBINARY_DIR}/wx-config" | 48 | "${wxBINARY_DIR}/wx-config" |
45 | ) | 49 | ) |
46 | endfunction() | 50 | endfunction() |
51 | diff --git a/build/cmake/install.cmake b/build/cmake/install.cmake | ||
52 | index 202d054..e255e0b 100644 | ||
47 | --- a/build/cmake/install.cmake | 53 | --- a/build/cmake/install.cmake |
48 | +++ b/build/cmake/install.cmake | 54 | +++ b/build/cmake/install.cmake |
49 | @@ -44,11 +44,11 @@ if(WIN32_MSVC_NAMING) | 55 | @@ -44,11 +44,11 @@ if(WIN32_MSVC_NAMING) |
@@ -90,3 +96,19 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com> | |||
90 | ) | 96 | ) |
91 | 97 | ||
92 | # uninstall target | 98 | # uninstall target |
99 | diff --git a/build/cmake/lib/webview/CMakeLists.txt b/build/cmake/lib/webview/CMakeLists.txt | ||
100 | index 2cb35e7..7977a84 100644 | ||
101 | --- a/build/cmake/lib/webview/CMakeLists.txt | ||
102 | +++ b/build/cmake/lib/webview/CMakeLists.txt | ||
103 | @@ -146,7 +146,7 @@ if(WXGTK AND wxUSE_WEBVIEW_WEBKIT2) | ||
104 | ${WEBKIT2_LIBRARIES} | ||
105 | ) | ||
106 | |||
107 | - wx_install(TARGETS wxwebkit2_ext LIBRARY DESTINATION "lib/wx/${WX_WEB_EXT_VERSION}/web-extensions") | ||
108 | + wx_install(TARGETS wxwebkit2_ext LIBRARY DESTINATION "lib${LIB_SUFFIX}/wx/${WX_WEB_EXT_VERSION}/web-extensions") | ||
109 | |||
110 | wx_add_dependencies(wxwebview wxwebkit2_ext) | ||
111 | endif() | ||
112 | -- | ||
113 | 2.49.0 | ||
114 | |||
diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.8.bb b/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.8.bb index 2137bc686c..8d1090a171 100644 --- a/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.8.bb +++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.8.bb | |||
@@ -40,6 +40,9 @@ EXTRA_OECMAKE += " \ | |||
40 | -DwxUSE_LIBPNG=sys \ | 40 | -DwxUSE_LIBPNG=sys \ |
41 | -DwxUSE_LIBTIFF=sys \ | 41 | -DwxUSE_LIBTIFF=sys \ |
42 | -DwxUSE_REGEX=builtin \ | 42 | -DwxUSE_REGEX=builtin \ |
43 | -DwxBUILD_INSTALL_RUNTIME_DIR=${libdir} \ | ||
44 | -DwxBUILD_INSTALL_LIBRARY_DIR=${libdir} \ | ||
45 | -DwxBUILD_INSTALL_PLATFORM_SUBDIR=${libdir} \ | ||
43 | " | 46 | " |
44 | EXTRA_OECMAKE:append:class-target = ' -DEGREP="/bin/grep -E"' | 47 | EXTRA_OECMAKE:append:class-target = ' -DEGREP="/bin/grep -E"' |
45 | 48 | ||