[meta-python][PATCH 083/109] python3-wxgtk4: Drop the --baselib option from WX_CONFIG
Khem Raj <[email protected]>
| Newsgroups | org.openembedded.lists.openembedded-devel |
|---|---|
| Message-ID | <[email protected]> |
wx-config gained --baselib from 0005-wx-config-fix-libdir-for-multilib.patch
in the wxwidgets recipe. The 3.2.11 upgrade dropped that patch, since
upstream reworked the install paths to derive from CMAKE_INSTALL_LIBDIR
and no longer needs it. wx-config therefore no longer accepts the option
and the build fails:
| *** Error: Unrecognised option: '--baselib=lib'
| Use wx-config --help for information on command line options.
Nothing else needs it: wxwidgets' do_compile:append already rewrites
libdir in wx-config to an absolute ${STAGING_LIBDIR}, so the lib
component never comes from the prefix here.
Signed-off-by: Khem Raj <[email protected]>
---
.../recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.2.5.bb | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.2.5.bb b/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.2.5.bb
index 9a8952df32..e1d8ed06e1 100644
--- a/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.2.5.bb
+++ b/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.2.5.bb
@@ -30,7 +30,10 @@ INSANE_SKIP += "pep517-backend"
REQUIRED_DISTRO_FEATURES = "x11"
-export WX_CONFIG = "'${RECIPE_SYSROOT_NATIVE}${bindir}/wx-config --prefix=${STAGING_EXECPREFIXDIR} --baselib=${baselib}'"
+# --baselib came from an out-of-tree wx-config patch that wxwidgets dropped in
+# 3.2.11; wx-config now rejects it. It is not needed either, as the wxwidgets
+# recipe rewrites libdir in wx-config to an absolute ${STAGING_LIBDIR}.
+export WX_CONFIG = "'${RECIPE_SYSROOT_NATIVE}${bindir}/wx-config --prefix=${STAGING_EXECPREFIXDIR}'"
RDEPENDS:${PN} = "\
python3-difflib \