summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2022-11-23 11:13:24 +0800
committerKhem Raj <raj.khem@gmail.com>2022-11-23 08:25:30 -0800
commit49b8714b2f440558104cc46401235b96b5f62d66 (patch)
tree64eb2da5aaefa323f5d98c9d221726e509a69782
parent57dfe3a0ceda6fbed087da59cbdb477c8926c3e5 (diff)
downloadmeta-openembedded-49b8714b2f440558104cc46401235b96b5f62d66.tar.gz
wxwidgets: 3.1.5 -> 3.2.1
Upgrade wxwidgets from 3.1.5 to 3.2.1. * rename respect-DESTDIR-when-create-link.patch that DESTDIR has considerred by upstream and only create symlink with relative path * rebase patches to replace wxPLATFORM_LIB_DIR with LIB_SUFFIX * split .so files to -dev package to fix [dev-so] qa error * fix host contamination Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-extended/wxwidgets/wxwidgets/create-links-with-relative-path.patch52
-rw-r--r--meta-oe/recipes-extended/wxwidgets/wxwidgets/fix-libdir-for-multilib.patch100
-rw-r--r--meta-oe/recipes-extended/wxwidgets/wxwidgets/not-append-system-name-to-lib-name.patch30
-rw-r--r--meta-oe/recipes-extended/wxwidgets/wxwidgets/respect-DESTDIR-when-create-link.patch55
-rw-r--r--meta-oe/recipes-extended/wxwidgets/wxwidgets/wx-config-fix-libdir-for-multilib.patch6
-rw-r--r--meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.1.bb (renamed from meta-oe/recipes-extended/wxwidgets/wxwidgets_3.1.5.bb)17
6 files changed, 145 insertions, 115 deletions
diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets/create-links-with-relative-path.patch b/meta-oe/recipes-extended/wxwidgets/wxwidgets/create-links-with-relative-path.patch
new file mode 100644
index 0000000000..6eef0b6790
--- /dev/null
+++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets/create-links-with-relative-path.patch
@@ -0,0 +1,52 @@
1It fails to build python3-wxgtk4 which depends on wxwidgets:
2
3| ERROR: wxwidgets-native-3.2.1-r0 do_populate_sysroot: sstate found an
4 absolute path symlink /path/to/build/tmp-glibc/work/x86_64-linux
5 /wxwidgets-native/3.2.1-r0/sysroot-destdir/path/to/build/tmp-glibc/work
6 /x86_64-linux/wxwidgets-native/3.2.1-r0/recipe-sysroot-native/usr/bin/wx-config
7 pointing at /path/to/build/tmp-glibc/work/x86_64-linux/wxwidgets-native/3.2.1-r0
8 /recipe-sysroot-native/usr/lib/wx/config/gtk3-unicode-3.2.
9 Please replace this with a relative link.
10| ERROR: wxwidgets-native-3.2.1-r0 do_populate_sysroot: sstate found an
11 absolute path symlink /path/to/build/tmp-glibc/work/x86_64-linux/wxwidgets-native
12 /3.2.1-r0/sysroot-destdir/path/to/build/tmp-glibc/work/x86_64-linux/wxwidgets-native
13 /3.2.1-r0/recipe-sysroot-native/usr/bin/wxrc pointing at /path/to/build/tmp-glibc
14 /work/x86_64-linux/wxwidgets-native/3.2.1-r0/recipe-sysroot-native/usr/bin/wxrc-3.2.
15 Please replace this with a relative link.
16
17Create symlink with relative path to fix the issues.
18
19Upstream-Status: Pending
20
21Signed-off-by: Kai Kang <kai.kang@windriver.com>
22---
23 build/cmake/install.cmake | 2 +-
24 build/cmake/utils/CMakeLists.txt | 2 +-
25 2 files changed, 2 insertions(+), 2 deletions(-)
26
27diff --git a/build/cmake/install.cmake b/build/cmake/install.cmake
28index d3303faabb..c79e187f37 100644
29--- a/build/cmake/install.cmake
30+++ b/build/cmake/install.cmake
31@@ -42,7 +42,7 @@ else()
32 install(DIRECTORY DESTINATION "bin")
33 install(CODE "execute_process( \
34 COMMAND ${CMAKE_COMMAND} -E create_symlink \
35- \"${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/wx/config/${wxBUILD_FILE_ID}\" \
36+ \"../lib${LIB_SUFFIX}/wx/config/${wxBUILD_FILE_ID}\" \
37 \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/wx-config\" \
38 )"
39 )
40diff --git a/build/cmake/utils/CMakeLists.txt b/build/cmake/utils/CMakeLists.txt
41index dbed8cc9b3..1dbc3261d3 100644
42--- a/build/cmake/utils/CMakeLists.txt
43+++ b/build/cmake/utils/CMakeLists.txt
44@@ -40,7 +40,7 @@ if(wxUSE_XRC)
45 # Don't use wx_install() here to preserve escaping.
46 install(CODE "execute_process( \
47 COMMAND ${CMAKE_COMMAND} -E create_symlink \
48- \"${CMAKE_INSTALL_PREFIX}/bin/${wxrc_output_name}${EXE_SUFFIX}\" \
49+ \"./${wxrc_output_name}${EXE_SUFFIX}\" \
50 \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/wxrc${EXE_SUFFIX}\" \
51 )"
52 )
diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets/fix-libdir-for-multilib.patch b/meta-oe/recipes-extended/wxwidgets/wxwidgets/fix-libdir-for-multilib.patch
index 555ed47ad6..ea204ed3b1 100644
--- a/meta-oe/recipes-extended/wxwidgets/wxwidgets/fix-libdir-for-multilib.patch
+++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets/fix-libdir-for-multilib.patch
@@ -4,80 +4,104 @@ change it. Respect variable wxPLATFORM_LIB_DIR to support libdir be configurable
4Upstream-Status: Pending 4Upstream-Status: Pending
5 5
6Signed-off-by: Kai Kang <kai.kang@windriver.com> 6Signed-off-by: Kai Kang <kai.kang@windriver.com>
7
8Rebase for wxWidgets 3.2.1. Replace wxPLATFORM_LIB_DIR with LIB_SUFFIX in this
9patch that LIB_SUFFIX has been passed to cmake in cmake.bbclass.
10
11Signed-off-by: Kai Kang <kai.kang@windriver.com>
7--- 12---
8 CMakeLists.txt | 2 +- 13 CMakeLists.txt | 2 +-
9 build/cmake/config.cmake | 2 +- 14 build/cmake/config.cmake | 2 +-
10 build/cmake/functions.cmake | 6 +++--- 15 build/cmake/functions.cmake | 4 ++--
11 build/cmake/install.cmake | 6 +++--- 16 build/cmake/install.cmake | 12 ++++++------
12 4 files changed, 8 insertions(+), 8 deletions(-) 17 4 files changed, 10 insertions(+), 10 deletions(-)
13 18
14diff --git a/CMakeLists.txt b/CMakeLists.txt 19diff --git a/CMakeLists.txt b/CMakeLists.txt
15index 4063020552..253d415210 100644 20index a49ecd3883..d469471f38 100644
16--- a/CMakeLists.txt 21--- a/CMakeLists.txt
17+++ b/CMakeLists.txt 22+++ b/CMakeLists.txt
18@@ -43,7 +43,7 @@ include(build/cmake/policies.cmake NO_POLICY_SCOPE) 23@@ -45,7 +45,7 @@ include(build/cmake/policies.cmake NO_POLICY_SCOPE)
19 # Initialize variables for quick access to wx root dir in sub dirs 24 # Initialize variables for quick access to wx root dir in sub dirs
20 set(wxSOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) 25 set(wxSOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
21 set(wxBINARY_DIR ${CMAKE_BINARY_DIR}) 26 set(wxBINARY_DIR ${CMAKE_BINARY_DIR})
22-set(wxOUTPUT_DIR ${wxBINARY_DIR}/lib) 27-set(wxOUTPUT_DIR ${wxBINARY_DIR}/lib)
23+set(wxOUTPUT_DIR ${wxBINARY_DIR}/lib${wxPLATFORM_LIB_DIR}) 28+set(wxOUTPUT_DIR ${wxBINARY_DIR}/lib${LIB_SUFFIX})
24 29
25 # parse the version number from wx/version.h and include in wxMAJOR_VERSION and wxMINOR_VERSION 30 # parse the version number from wx/version.h and include in wxMAJOR_VERSION and wxMINOR_VERSION
26 file(READ include/wx/version.h WX_VERSION_H_CONTENTS) 31 file(READ "${wxSOURCE_DIR}/include/wx/version.h" WX_VERSION_H_CONTENTS)
27diff --git a/build/cmake/config.cmake b/build/cmake/config.cmake 32diff --git a/build/cmake/config.cmake b/build/cmake/config.cmake
28index 91d11acba2..f361d50a27 100644 33index b359560bc0..c59ea60923 100644
29--- a/build/cmake/config.cmake 34--- a/build/cmake/config.cmake
30+++ b/build/cmake/config.cmake 35+++ b/build/cmake/config.cmake
31@@ -57,7 +57,7 @@ function(wx_write_config_inplace) 36@@ -76,7 +76,7 @@ function(wx_write_config_inplace)
32 execute_process( 37 execute_process(
33 COMMAND 38 COMMAND
34 ${CMAKE_COMMAND} -E create_symlink 39 "${CMAKE_COMMAND}" -E ${COPY_CMD}
35- "lib/wx/config/inplace-${TOOLCHAIN_FULLNAME}" 40- "${CMAKE_CURRENT_BINARY_DIR}/lib/wx/config/inplace-${TOOLCHAIN_FULLNAME}"
36+ "lib${wxPLATFORM_LIB_DIR}/wx/config/inplace-${TOOLCHAIN_FULLNAME}" 41+ "${CMAKE_CURRENT_BINARY_DIR}/lib${LIB_SUFFIX}/wx/config/inplace-${TOOLCHAIN_FULLNAME}"
37 "${CMAKE_CURRENT_BINARY_DIR}/wx-config" 42 "${CMAKE_CURRENT_BINARY_DIR}/wx-config"
38 ) 43 )
39 endfunction() 44 endfunction()
40diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake 45diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake
41index c33dd3946c..51e47e05b3 100644 46index 7182364e5e..55fbebc7ee 100644
42--- a/build/cmake/functions.cmake 47--- a/build/cmake/functions.cmake
43+++ b/build/cmake/functions.cmake 48+++ b/build/cmake/functions.cmake
44@@ -78,9 +78,9 @@ function(wx_set_common_target_properties target_name) 49@@ -435,8 +435,8 @@ macro(wx_add_library name)
45 cmake_parse_arguments(wxCOMMON_TARGET_PROPS "DEFAULT_WARNINGS" "" "" ${ARGN}) 50 endif()
46 51 wx_install(TARGETS ${name}
47 set_target_properties(${target_name} PROPERTIES 52 EXPORT wxWidgetsTargets
48- LIBRARY_OUTPUT_DIRECTORY "${wxOUTPUT_DIR}${wxPLATFORM_LIB_DIR}" 53- LIBRARY DESTINATION "lib${GEN_EXPR_DIR}${wxPLATFORM_LIB_DIR}"
49- ARCHIVE_OUTPUT_DIRECTORY "${wxOUTPUT_DIR}${wxPLATFORM_LIB_DIR}" 54- ARCHIVE DESTINATION "lib${GEN_EXPR_DIR}${wxPLATFORM_LIB_DIR}"
50- RUNTIME_OUTPUT_DIRECTORY "${wxOUTPUT_DIR}${wxPLATFORM_LIB_DIR}" 55+ LIBRARY DESTINATION "lib${LIB_SUFFIX}${GEN_EXPR_DIR}${wxPLATFORM_LIB_DIR}"
51+ LIBRARY_OUTPUT_DIRECTORY "${wxOUTPUT_DIR}" 56+ ARCHIVE DESTINATION "lib${LIB_SUFFIX}${GEN_EXPR_DIR}${wxPLATFORM_LIB_DIR}"
52+ ARCHIVE_OUTPUT_DIRECTORY "${wxOUTPUT_DIR}" 57 RUNTIME DESTINATION "${runtime_dir}${GEN_EXPR_DIR}${wxPLATFORM_LIB_DIR}"
53+ RUNTIME_OUTPUT_DIRECTORY "${wxOUTPUT_DIR}" 58 BUNDLE DESTINATION Applications/wxWidgets
54 ) 59 )
55
56 if(wxBUILD_PIC)
57diff --git a/build/cmake/install.cmake b/build/cmake/install.cmake 60diff --git a/build/cmake/install.cmake b/build/cmake/install.cmake
58index 968dff859e..c850c51844 100644 61index 384c6837b8..d3303faabb 100644
59--- a/build/cmake/install.cmake 62--- a/build/cmake/install.cmake
60+++ b/build/cmake/install.cmake 63+++ b/build/cmake/install.cmake
61@@ -33,11 +33,11 @@ if(MSVC) 64@@ -29,11 +29,11 @@ if(WIN32_MSVC_NAMING)
62 else() 65 else()
63 wx_install( 66 install(
64 DIRECTORY "${wxSETUP_HEADER_PATH}" 67 DIRECTORY "${wxSETUP_HEADER_PATH}"
65- DESTINATION "lib/wx/include") 68- DESTINATION "lib/wx/include")
66+ DESTINATION "lib${wxPLATFORM_LIB_DIR}/wx/include") 69+ DESTINATION "lib${LIB_SUFFIX}/wx/include")
67 70
68 wx_install( 71 install(
69 FILES "${wxOUTPUT_DIR}/wx/config/${wxBUILD_FILE_ID}" 72 FILES "${wxOUTPUT_DIR}/wx/config/${wxBUILD_FILE_ID}"
70- DESTINATION "lib/wx/config" 73- DESTINATION "lib/wx/config"
71+ DESTINATION "lib${wxPLATFORM_LIB_DIR}/wx/config" 74+ DESTINATION "lib${LIB_SUFFIX}/wx/config"
72 PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ 75 PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ
73 GROUP_EXECUTE GROUP_READ 76 GROUP_EXECUTE GROUP_READ
74 WORLD_EXECUTE WORLD_READ 77 WORLD_EXECUTE WORLD_READ
75@@ -46,7 +46,7 @@ else() 78@@ -42,13 +42,13 @@ else()
76 install(DIRECTORY DESTINATION "bin") 79 install(DIRECTORY DESTINATION "bin")
77 install(CODE "execute_process( \ 80 install(CODE "execute_process( \
78 COMMAND ${CMAKE_COMMAND} -E create_symlink \ 81 COMMAND ${CMAKE_COMMAND} -E create_symlink \
79- ${CMAKE_INSTALL_PREFIX}/lib/wx/config/${wxBUILD_FILE_ID} \ 82- \"${CMAKE_INSTALL_PREFIX}/lib/wx/config/${wxBUILD_FILE_ID}\" \
80+ ${CMAKE_INSTALL_PREFIX}/lib${wxPLATFORM_LIB_DIR}/wx/config/${wxBUILD_FILE_ID} \ 83+ \"${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/wx/config/${wxBUILD_FILE_ID}\" \
81 ${CMAKE_INSTALL_PREFIX}/bin/wx-config \ 84 \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/wx-config\" \
82 )" 85 )"
83 ) 86 )
87 endif()
88
89-install(EXPORT wxWidgetsTargets NAMESPACE wx:: DESTINATION "lib/cmake/wxWidgets/${wxPLATFORM_LIB_DIR}")
90+install(EXPORT wxWidgetsTargets NAMESPACE wx:: DESTINATION "lib${LIB_SUFFIX}/cmake/wxWidgets/${wxPLATFORM_LIB_DIR}")
91
92 # find_package config file
93 include(CMakePackageConfigHelpers)
94@@ -71,11 +71,11 @@ write_basic_package_version_file(
95 configure_package_config_file(
96 "${wxSOURCE_DIR}/build/cmake/wxWidgetsConfig.cmake.in"
97 "${projectConfig}"
98- INSTALL_DESTINATION "lib/cmake/wxWidgets"
99+ INSTALL_DESTINATION "lib${LIB_SUFFIX}/cmake/wxWidgets"
100 )
101 install(
102 FILES "${projectConfig}" "${versionConfig}"
103- DESTINATION "lib/cmake/wxWidgets"
104+ DESTINATION "lib${LIB_SUFFIX}/cmake/wxWidgets"
105 )
106
107 # uninstall target
diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets/not-append-system-name-to-lib-name.patch b/meta-oe/recipes-extended/wxwidgets/wxwidgets/not-append-system-name-to-lib-name.patch
index 0f78cc134e..6329256b0c 100644
--- a/meta-oe/recipes-extended/wxwidgets/wxwidgets/not-append-system-name-to-lib-name.patch
+++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets/not-append-system-name-to-lib-name.patch
@@ -5,24 +5,28 @@ not appropriate for oe.
5Upstream-Status: Pending [oe specific] 5Upstream-Status: Pending [oe specific]
6 6
7Signed-off-by: Kai Kang <kai.kang@windriver.com> 7Signed-off-by: Kai Kang <kai.kang@windriver.com>
8
9Rebase for wxWidgets 3.2.1.
10
11Signed-off-by: Kai Kang <kai.kang@windriver.com>
8--- 12---
9 build/cmake/functions.cmake | 6 +++--- 13 build/cmake/functions.cmake | 6 +++---
10 1 file changed, 3 insertions(+), 3 deletions(-) 14 1 file changed, 3 insertions(+), 3 deletions(-)
11 15
12diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake 16diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake
13index 53cd6a1ace..95efa17fe4 100644 17index e374d9a273..c6b1908bd6 100644
14--- a/build/cmake/functions.cmake 18--- a/build/cmake/functions.cmake
15+++ b/build/cmake/functions.cmake 19+++ b/build/cmake/functions.cmake
16@@ -211,9 +211,9 @@ function(wx_set_target_properties target_name is_base) 20@@ -219,9 +219,9 @@ function(wx_set_target_properties target_name)
17 endif() 21 endif()
18 else() 22
19 set(cross_target "") 23 set(cross_target)
20- if (CMAKE_CROSSCOMPILING) 24- if (CMAKE_CROSSCOMPILING)
21- set(cross_target "-${CMAKE_SYSTEM_NAME}") 25- set(cross_target "-${CMAKE_SYSTEM_NAME}")
22- endif () 26- endif()
23+ #if (CMAKE_CROSSCOMPILING) 27+ #if (CMAKE_CROSSCOMPILING)
24+ # set(cross_target "-${CMAKE_SYSTEM_NAME}") 28+ # set(cross_target "-${CMAKE_SYSTEM_NAME}")
25+ #endif () 29+ #endif()
26 30
27 set_target_properties(${target_name} 31 set(lib_prefix "lib")
28 PROPERTIES 32 if(MSVC OR (WIN32 AND wxBUILD_SHARED))
diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets/respect-DESTDIR-when-create-link.patch b/meta-oe/recipes-extended/wxwidgets/wxwidgets/respect-DESTDIR-when-create-link.patch
deleted file mode 100644
index 69be32928c..0000000000
--- a/meta-oe/recipes-extended/wxwidgets/wxwidgets/respect-DESTDIR-when-create-link.patch
+++ /dev/null
@@ -1,55 +0,0 @@
1There are errors during do install. So link files 'wx-config' and 'wxrc' are
2not created, and rename failed either:
3
4| CMake Error: failed to create symbolic link '/usr/bin/wx-config': Permission denied
5| Error renaming from "/usr/bin/wxrc" to "/usr/bin/wxrc-3.1": No such file or directory
6| CMake Error: failed to create symbolic link '/usr/bin/wxrc': Permission denied
7
8Respect variable 'DESTDIR' to make it work as expect.
9
10Upstream-Status: Pending
11
12Signed-off-by: Kai Kang <kai.kang@windriver.com>
13---
14 build/cmake/install.cmake | 4 ++--
15 build/cmake/utils/CMakeLists.txt | 8 ++++----
16 2 files changed, 6 insertions(+), 6 deletions(-)
17
18diff --git a/build/cmake/install.cmake b/build/cmake/install.cmake
19index c850c51844..5cbc67daa1 100644
20--- a/build/cmake/install.cmake
21+++ b/build/cmake/install.cmake
22@@ -46,8 +46,8 @@ else()
23 install(DIRECTORY DESTINATION "bin")
24 install(CODE "execute_process( \
25 COMMAND ${CMAKE_COMMAND} -E create_symlink \
26- ${CMAKE_INSTALL_PREFIX}/lib${wxPLATFORM_LIB_DIR}/wx/config/${wxBUILD_FILE_ID} \
27- ${CMAKE_INSTALL_PREFIX}/bin/wx-config \
28+ ../lib${wxPLATFORM_LIB_DIR}/wx/config/${wxBUILD_FILE_ID} \
29+ \$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/wx-config \
30 )"
31 )
32 endif()
33diff --git a/build/cmake/utils/CMakeLists.txt b/build/cmake/utils/CMakeLists.txt
34index 4108d6a723..fbac6bb533 100644
35--- a/build/cmake/utils/CMakeLists.txt
36+++ b/build/cmake/utils/CMakeLists.txt
37@@ -34,14 +34,14 @@ if(wxUSE_XRC)
38 if(NOT MSVC)
39 install(CODE "execute_process( \
40 COMMAND ${CMAKE_COMMAND} -E rename \
41- ${CMAKE_INSTALL_PREFIX}/bin/wxrc${EXE_SUFFIX} \
42- ${CMAKE_INSTALL_PREFIX}/bin/wxrc-${wxMAJOR_VERSION}.${wxMINOR_VERSION}${EXE_SUFFIX} \
43+ \$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/wxrc${EXE_SUFFIX} \
44+ \$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/wxrc-${wxMAJOR_VERSION}.${wxMINOR_VERSION}${EXE_SUFFIX} \
45 )"
46 )
47 install(CODE "execute_process( \
48 COMMAND ${CMAKE_COMMAND} -E create_symlink \
49- ${CMAKE_INSTALL_PREFIX}/bin/wxrc-${wxMAJOR_VERSION}.${wxMINOR_VERSION}${EXE_SUFFIX} \
50- ${CMAKE_INSTALL_PREFIX}/bin/wxrc${EXE_SUFFIX} \
51+ wxrc-${wxMAJOR_VERSION}.${wxMINOR_VERSION}${EXE_SUFFIX} \
52+ \$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/wxrc${EXE_SUFFIX} \
53 )"
54 )
55 endif()
diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets/wx-config-fix-libdir-for-multilib.patch b/meta-oe/recipes-extended/wxwidgets/wxwidgets/wx-config-fix-libdir-for-multilib.patch
index 7ce206d263..628f8dee56 100644
--- a/meta-oe/recipes-extended/wxwidgets/wxwidgets/wx-config-fix-libdir-for-multilib.patch
+++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets/wx-config-fix-libdir-for-multilib.patch
@@ -5,6 +5,10 @@ cross compile. And set default value of baselib with "lib${wxPLATFORM_LIB_DIR}".
5Upstream-Status: Pending [oe specific] 5Upstream-Status: Pending [oe specific]
6 6
7Signed-off-by: Kai Kang <kai.kang@windriver.com> 7Signed-off-by: Kai Kang <kai.kang@windriver.com>
8
9Rebase for wxWidgets 3.2.1. Replace wxPLATFORM_LIB_DIR with variable LIB_SUFFIX.
10
11Signed-off-by: Kai Kang <kai.kang@windriver.com>
8--- 12---
9 build/cmake/config.cmake | 2 +- 13 build/cmake/config.cmake | 2 +-
10 wx-config.in | 6 ++++-- 14 wx-config.in | 6 ++++--
@@ -50,7 +54,7 @@ index e3f7d115bb..0e78af03c7 100755
50 # Determine the base directories we require. 54 # Determine the base directories we require.
51 prefix=${input_option_prefix-${this_prefix:-@prefix@}} 55 prefix=${input_option_prefix-${this_prefix:-@prefix@}}
52 exec_prefix=${input_option_exec_prefix-${input_option_prefix-${this_exec_prefix:-@exec_prefix@}}} 56 exec_prefix=${input_option_exec_prefix-${input_option_prefix-${this_exec_prefix:-@exec_prefix@}}}
53+baselib=${input_option_baselib:-lib@wxPLATFORM_LIB_DIR@} 57+baselib=${input_option_baselib:-lib${LIB_SUFFIX}}
54 wxconfdir="@libdir@/wx/config" 58 wxconfdir="@libdir@/wx/config"
55 59
56 installed_configs=`cd "$wxconfdir" 2> /dev/null && ls | grep -v "^inplace-"` 60 installed_configs=`cd "$wxconfdir" 2> /dev/null && ls | grep -v "^inplace-"`
diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.1.5.bb b/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.1.bb
index 5565a289fe..4bb07fda02 100644
--- a/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.1.5.bb
+++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.1.bb
@@ -19,14 +19,14 @@ DEPENDS += " \
19" 19"
20 20
21SRC_URI = " \ 21SRC_URI = " \
22 gitsm://github.com/wxWidgets/wxWidgets.git;branch=master;protocol=https \ 22 gitsm://github.com/wxWidgets/wxWidgets.git;branch=3.2;protocol=https \
23 file://0001-wx-config.in-Disable-cross-magic-it-does-not-work-fo.patch \ 23 file://0001-wx-config.in-Disable-cross-magic-it-does-not-work-fo.patch \
24 file://fix-libdir-for-multilib.patch \ 24 file://fix-libdir-for-multilib.patch \
25 file://respect-DESTDIR-when-create-link.patch \ 25 file://create-links-with-relative-path.patch \
26 file://not-append-system-name-to-lib-name.patch \ 26 file://not-append-system-name-to-lib-name.patch \
27 file://wx-config-fix-libdir-for-multilib.patch \ 27 file://wx-config-fix-libdir-for-multilib.patch \
28" 28"
29SRCREV= "9c0a8be1dc32063d91ed1901fd5fcd54f4f955a1" 29SRCREV= "97e99707c5d2271a70cb686720b48dbf34ced496"
30S = "${WORKDIR}/git" 30S = "${WORKDIR}/git"
31 31
32# These can be either 'builtin' or 'sys' and builtin means cloned soures are 32# These can be either 'builtin' or 'sys' and builtin means cloned soures are
@@ -38,7 +38,6 @@ EXTRA_OECMAKE += " \
38 -DwxUSE_LIBPNG=sys \ 38 -DwxUSE_LIBPNG=sys \
39 -DwxUSE_LIBTIFF=sys \ 39 -DwxUSE_LIBTIFF=sys \
40 -DwxUSE_REGEX=builtin \ 40 -DwxUSE_REGEX=builtin \
41 -DwxPLATFORM_LIB_DIR=${@d.getVar('baselib').replace('lib', '')} \
42" 41"
43EXTRA_OECMAKE:append:libc-musl = " \ 42EXTRA_OECMAKE:append:libc-musl = " \
44 -DHAVE_LOCALE_T=OFF \ 43 -DHAVE_LOCALE_T=OFF \
@@ -100,13 +99,15 @@ do_compile:append() {
100do_install:append() { 99do_install:append() {
101 # do not ship bindir if empty 100 # do not ship bindir if empty
102 rmdir --ignore-fail-on-non-empty ${D}${bindir} 101 rmdir --ignore-fail-on-non-empty ${D}${bindir}
103}
104 102
105# lib names are not canonical 103 # fix host contamination
106FILES_SOLIBSDEV = "" 104 sed -i -e "s#${STAGING_DIR_NATIVE}##g" \
105 -e "s#${STAGING_DIR_TARGET}##g" \
106 ${D}${libdir}/wx/config/gtk3-unicode-3.2 \
107 ${D}${libdir}/cmake/wxWidgets/wxWidgetsTargets.cmake
108}
107 109
108FILES:${PN} += " \ 110FILES:${PN} += " \
109 ${libdir}/libwx_*.so \
110 ${libdir}/wx/ \ 111 ${libdir}/wx/ \
111" 112"
112 113