Re: [oe] [meta-python][PATCH] python3-wxgtk4: add distro feature check to match dependency
Hello, On 4/4/22 20:44, Davide Gardenal wrote: Add REQUIRED_DISTRO_FEATURE to match wxwidgets, this fix build error (not buildable target) when x11 is not supported Signed-off-by: Davide Gardenal --- .../recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.1.1.bb | 4 1 file changed, 4 insertions(+) diff --git a/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.1.1.bb b/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.1.1.bb index e61b00efa..dcb373a1f 100644 --- a/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.1.1.bb +++ b/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.1.1.bb @@ -4,6 +4,10 @@ HOMEPAGE = "http://www.wxpython.org"; LICENSE = "WXwindows" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=fce1d18e2d633d41786c0a8dfbc80917" +inherit features_check + +REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG', 'no_gui', '', 'x11', d)}" The fix isn't correct enough since there is no PACKAGECONFIG for python3-wxgtk4, I will send another patch based on this. // Robert + DEPENDS = "wxwidgets-native wxwidgets" PYPI_PACKAGE = "wxPython" -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#96494): https://lists.openembedded.org/g/openembedded-devel/message/96494 Mute This Topic: https://lists.openembedded.org/mt/90240535/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-python][PATCH] python3-wxgtk4: Require DISTRO_FEATURES as gtk3
It can't be built without gtk3: No package 'gtk+-3.0' found So make it have the same DISTRO_FEATURES as gtk3. It may also support gtk2, but it depends on wxwidgets which doesn't support gtk2, so we don't have to consider that. And python3-wxgtk4 doesn't have PACKAGECONFIG, so remove the checking for PACKAGECONFIG. Signed-off-by: Robert Yang --- .../python3-wxgtk4/python3-wxgtk4_4.1.1.bb| 8 +++- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.1.1.bb b/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.1.1.bb index dcb373a1f..cbe3aedd1 100644 --- a/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.1.1.bb +++ b/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.1.1.bb @@ -4,10 +4,6 @@ HOMEPAGE = "http://www.wxpython.org"; LICENSE = "WXwindows" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=fce1d18e2d633d41786c0a8dfbc80917" -inherit features_check - -REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG', 'no_gui', '', 'x11', d)}" - DEPENDS = "wxwidgets-native wxwidgets" PYPI_PACKAGE = "wxPython" @@ -20,7 +16,9 @@ SRC_URI[sha256sum] = "00e5e3180ac7f2852f342ad341d57c44e7e4326de0b550b9a5c4a8361b S = "${WORKDIR}/wxPython-${PV}" -inherit pypi setuptools3 pkgconfig +inherit pypi setuptools3 pkgconfig features_check + +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" export WX_CONFIG = "'${RECIPE_SYSROOT_NATIVE}${bindir}/wx-config --prefix=${STAGING_EXECPREFIXDIR}'" -- 2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#96495): https://lists.openembedded.org/g/openembedded-devel/message/96495 Mute This Topic: https://lists.openembedded.org/mt/90352867/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH] libcereal: Link in libatomic on rv32 for ptests
Signed-off-by: Khem Raj --- meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb b/meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb index fb37de3c30..b76cd2eb60 100644 --- a/meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb +++ b/meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb @@ -27,6 +27,7 @@ S = "${WORKDIR}/git" inherit cmake pkgconfig ptest LIBATOMIC:mips:toolchain-clang = "${@bb.utils.contains('PTEST_ENABLED', '1', '-DCEREAL_THREAD_LIBS="-latomic"', '', d)}" +LIBATOMIC:riscv32:toolchain-clang = "${@bb.utils.contains('PTEST_ENABLED', '1', '-DCEREAL_THREAD_LIBS="-latomic"', '', d)}" PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'with-tests', '', d)}" PACKAGECONFIG[with-tests] = "-DWITH_WERROR=OFF -DBUILD_TESTS=ON ${LIBATOMIC},," -- 2.35.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#96496): https://lists.openembedded.org/g/openembedded-devel/message/96496 Mute This Topic: https://lists.openembedded.org/mt/90356369/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-gnome][PATCHv4] gparted: update to v1.4.0
- remove x11 features-check because there aren't dependencies that would explicilty require x11 as a DISTRO_FEATURE - use POSIX basename() to fix up musl build GParted 1.4.0 (2022-03-28) Release Notes - This release of GParted includes enhancements, bug fixes and language translation updates. * Add labelling of mounted btrfs, ext2/3/4 and xfs file systems * Fix detection of mount points for encrypted file systems * Fix crash scrolling quickly in the drive selection combobox * Add bcache detection * Add JBD external EXT3/4 journal detection Bug Fixes - * Add labelling of mounted btrfs, ext2/3/4 and xfs file systems (#163, !87) * Fix detection of mount points for encrypted file systems (#162, !88) * Fix unmount error when unmounting below a bind mount point (!89) * Fix crash scrolling quickly in the drive selection combobox (#165, !91) * Add initial Indonesian translation of help (!90) * Add accessibility relations for screen readers like Orca (!92) * Fix partition creation at sector 2048 if partition before it (#172, !93) * Make more getter methods use return-by-constant-reference (!94) * Check copy destination instead of source (!95) * Add bcache detection (#183, !96) * Add JBD external EXT3/4 journal detection (#89, !97) * Fix translation of DocBook markup tag of the GParted Manual (!98) Code Credits Code enhancements are courtesy of Movie Ma, Pascal Engélibert, and Mike Fleetwood. Translations (new/updated) -- cs(Marek Černocký), da(Alan Mortensen), eu(Asier Sarasua Garmendia), fur(Fabio Tomat), he(Yaron Shahrabani), hr(Goran Vidović), hu(Balázs Úr), id(Andika Triwidada), it(Milo Casagrande), ko(Seong-ho Cho), lt(Aurimas Černius), lv(Rūdolfs Mazurs), nb(Kjell Cato Heskjestad), nl(Nathan Follens), pa(A S Alam), pt(Hugo Carvalho), ru(Aleksandr Melman, Sergej A), sk(Dušan Kazik), sl(Matej Urbančič), sr(Мирослав Николић), zh_CN(Luming Zh) Dependencies (new/updated) -- * n/a Signed-off-by: Markus Volk --- .../files/0001-use-posix-basename.patch | 30 +++ .../{gparted_1.3.1.bb => gparted_1.4.0.bb}| 6 ++-- 2 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 meta-gnome/recipes-extended/gparted/files/0001-use-posix-basename.patch rename meta-gnome/recipes-extended/gparted/{gparted_1.3.1.bb => gparted_1.4.0.bb} (83%) diff --git a/meta-gnome/recipes-extended/gparted/files/0001-use-posix-basename.patch b/meta-gnome/recipes-extended/gparted/files/0001-use-posix-basename.patch new file mode 100644 index 0..aae200e27 --- /dev/null +++ b/meta-gnome/recipes-extended/gparted/files/0001-use-posix-basename.patch @@ -0,0 +1,30 @@ +Subject: [PATCH] BCache_Info.cc: use posix basename + +gnu 'basename' is undeclared for cplusplus if using musl. Use posix basename instead. + +fdebug-prefix-map=TOPDIR/build/tmp/work/cortexa57-yoe-linux-musl/gparted/1.4.0-r0/ +recipe-sysroot-native=-fvisibility-inlines-hidden -c -o Dialog_Disklabel.o ../../ +gparted-1.4.0/src/Dialog_Disklabel.cc ../../gparted-1.4.0/src/BCache_Info.cc:52:33: + +error: use of undeclared identifier 'basename'; did you mean 'g_basename'? +return "/dev/" + Glib::ustring(basename(buf)); + ^~~~ + g_basename + +Signed-off-by: Markus Volk + +Upstream-Status: Submitted + +https://gitlab.gnome.org/GNOME/gparted/-/merge_requests/99 + +--- a/src/BCache_Info.cc 2022-03-02 22:04:17.0 +0100 b/src/BCache_Info.cc 2022-04-09 15:02:56.932218665 +0200 +@@ -17,7 +17,7 @@ + + #include "BCache_Info.h" + +-#include // GNU version of basename() ++#include // POSIX version of basename() + #include + #include + #include diff --git a/meta-gnome/recipes-extended/gparted/gparted_1.3.1.bb b/meta-gnome/recipes-extended/gparted/gparted_1.4.0.bb similarity index 83% rename from meta-gnome/recipes-extended/gparted/gparted_1.3.1.bb rename to meta-gnome/recipes-extended/gparted/gparted_1.4.0.bb index d1a975930..6f774904b 100644 --- a/meta-gnome/recipes-extended/gparted/gparted_1.3.1.bb +++ b/meta-gnome/recipes-extended/gparted/gparted_1.4.0.bb @@ -3,16 +3,16 @@ HOMEPAGE = "http://gparted.org/index.php"; LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -inherit features_check autotools pkgconfig python3native gnome-help gtk-icon-cache +inherit autotools pkgconfig python3native gnome-help gtk-icon-cache -REQUIRED_DISTRO_FEATURES = "x11" SRC_URI = " \ ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${BPN}-${PV}/${BPN}-${PV}.tar.gz \ file://0001-Install-polkit-action-unconditionally-executable-pke.patch \ file://0001-Do-not-use-NULL-where-boolean-is-expected.patch \ +file://0001-use-posix-basename.patch \ " -SRC_URI[sha256sum] = "5eee2e6d
Re: [oe] [meta-gnome][PATCHv4] gparted: update to v1.4.0
Upstream told me, that using g_path_get_basename will create a memleak and i should use posix basename instead. Am 09.04.22 um 16:16 schrieb Markus Volk: - remove x11 features-check because there aren't dependencies that would explicilty require x11 as a DISTRO_FEATURE - use POSIX basename() to fix up musl build GParted 1.4.0 (2022-03-28) Release Notes - This release of GParted includes enhancements, bug fixes and language translation updates. * Add labelling of mounted btrfs, ext2/3/4 and xfs file systems * Fix detection of mount points for encrypted file systems * Fix crash scrolling quickly in the drive selection combobox * Add bcache detection * Add JBD external EXT3/4 journal detection Bug Fixes - * Add labelling of mounted btrfs, ext2/3/4 and xfs file systems (#163, !87) * Fix detection of mount points for encrypted file systems (#162, !88) * Fix unmount error when unmounting below a bind mount point (!89) * Fix crash scrolling quickly in the drive selection combobox (#165, !91) * Add initial Indonesian translation of help (!90) * Add accessibility relations for screen readers like Orca (!92) * Fix partition creation at sector 2048 if partition before it (#172, !93) * Make more getter methods use return-by-constant-reference (!94) * Check copy destination instead of source (!95) * Add bcache detection (#183, !96) * Add JBD external EXT3/4 journal detection (#89, !97) * Fix translation of DocBook markup tag of the GParted Manual (!98) Code Credits Code enhancements are courtesy of Movie Ma, Pascal Engélibert, and Mike Fleetwood. Translations (new/updated) -- cs(Marek Černocký), da(Alan Mortensen), eu(Asier Sarasua Garmendia), fur(Fabio Tomat), he(Yaron Shahrabani), hr(Goran Vidović), hu(Balázs Úr), id(Andika Triwidada), it(Milo Casagrande), ko(Seong-ho Cho), lt(Aurimas Černius), lv(Rūdolfs Mazurs), nb(Kjell Cato Heskjestad), nl(Nathan Follens), pa(A S Alam), pt(Hugo Carvalho), ru(Aleksandr Melman, Sergej A), sk(Dušan Kazik), sl(Matej Urbančič), sr(Мирослав Николић), zh_CN(Luming Zh) Dependencies (new/updated) -- * n/a Signed-off-by: Markus Volk --- .../files/0001-use-posix-basename.patch | 30 +++ .../{gparted_1.3.1.bb => gparted_1.4.0.bb}| 6 ++-- 2 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 meta-gnome/recipes-extended/gparted/files/0001-use-posix-basename.patch rename meta-gnome/recipes-extended/gparted/{gparted_1.3.1.bb => gparted_1.4.0.bb} (83%) diff --git a/meta-gnome/recipes-extended/gparted/files/0001-use-posix-basename.patch b/meta-gnome/recipes-extended/gparted/files/0001-use-posix-basename.patch new file mode 100644 index 0..aae200e27 --- /dev/null +++ b/meta-gnome/recipes-extended/gparted/files/0001-use-posix-basename.patch @@ -0,0 +1,30 @@ +Subject: [PATCH] BCache_Info.cc: use posix basename + +gnu 'basename' is undeclared for cplusplus if using musl. Use posix basename instead. + +fdebug-prefix-map=TOPDIR/build/tmp/work/cortexa57-yoe-linux-musl/gparted/1.4.0-r0/ +recipe-sysroot-native=-fvisibility-inlines-hidden -c -o Dialog_Disklabel.o ../../ +gparted-1.4.0/src/Dialog_Disklabel.cc ../../gparted-1.4.0/src/BCache_Info.cc:52:33: + +error: use of undeclared identifier 'basename'; did you mean 'g_basename'? +return "/dev/" + Glib::ustring(basename(buf)); + ^~~~ + g_basename + +Signed-off-by: Markus Volk + +Upstream-Status: Submitted + +https://gitlab.gnome.org/GNOME/gparted/-/merge_requests/99 + +--- a/src/BCache_Info.cc 2022-03-02 22:04:17.0 +0100 b/src/BCache_Info.cc 2022-04-09 15:02:56.932218665 +0200 +@@ -17,7 +17,7 @@ + + #include "BCache_Info.h" + +-#include // GNU version of basename() ++#include // POSIX version of basename() + #include + #include + #include diff --git a/meta-gnome/recipes-extended/gparted/gparted_1.3.1.bb b/meta-gnome/recipes-extended/gparted/gparted_1.4.0.bb similarity index 83% rename from meta-gnome/recipes-extended/gparted/gparted_1.3.1.bb rename to meta-gnome/recipes-extended/gparted/gparted_1.4.0.bb index d1a975930..6f774904b 100644 --- a/meta-gnome/recipes-extended/gparted/gparted_1.3.1.bb +++ b/meta-gnome/recipes-extended/gparted/gparted_1.4.0.bb @@ -3,16 +3,16 @@ HOMEPAGE = "http://gparted.org/index.php"; LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -inherit features_check autotools pkgconfig python3native gnome-help gtk-icon-cache +inherit autotools pkgconfig python3native gnome-help gtk-icon-cache -REQUIRED_DISTRO_FEATURES = "x11" SRC_URI = " \ ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${BPN}-${PV}/${BPN}-${PV}.tar.gz \ file://0001-Install
[oe] [meta-oe][PATCH] gnuplot: Disable libcerf and fix typo
We do not carry recipe for libcerf, so disable it explicitly so the native builds are also a bit more deterministic. Fix a typo in knob to disable wxwidgets Signed-off-by: Khem Raj --- meta-oe/recipes-extended/gnuplot/gnuplot_5.4.3.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot_5.4.3.bb b/meta-oe/recipes-extended/gnuplot/gnuplot_5.4.3.bb index 087b69faae..7343a08c7d 100644 --- a/meta-oe/recipes-extended/gnuplot/gnuplot_5.4.3.bb +++ b/meta-oe/recipes-extended/gnuplot/gnuplot_5.4.3.bb @@ -45,7 +45,8 @@ PACKAGECONFIG[qt5] = "--with-qt --with-qt5nativesysroot=${STAGING_DIR_NATIVE},-- EXTRA_OECONF = " \ --with-readline=${STAGING_LIBDIR}/.. \ --disable-wxwidgets \ +--disable-wxwidgets \ +--without-libcerf \ " do_compile:prepend() { -- 2.35.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#96499): https://lists.openembedded.org/g/openembedded-devel/message/96499 Mute This Topic: https://lists.openembedded.org/mt/90356794/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [oe] [meta-gnome][PATCHv4] gparted: update to v1.4.0
On 4/9/22 07:19, Markus Volk wrote: Upstream told me, that using g_path_get_basename will create a memleak and i should use posix basename instead. interesting, it was worth asking upstream. Thanks for follow up. Am 09.04.22 um 16:16 schrieb Markus Volk: - remove x11 features-check because there aren't dependencies that would explicilty require x11 as a DISTRO_FEATURE - use POSIX basename() to fix up musl build GParted 1.4.0 (2022-03-28) Release Notes - This release of GParted includes enhancements, bug fixes and language translation updates. * Add labelling of mounted btrfs, ext2/3/4 and xfs file systems * Fix detection of mount points for encrypted file systems * Fix crash scrolling quickly in the drive selection combobox * Add bcache detection * Add JBD external EXT3/4 journal detection Bug Fixes - * Add labelling of mounted btrfs, ext2/3/4 and xfs file systems (#163, !87) * Fix detection of mount points for encrypted file systems (#162, !88) * Fix unmount error when unmounting below a bind mount point (!89) * Fix crash scrolling quickly in the drive selection combobox (#165, !91) * Add initial Indonesian translation of help (!90) * Add accessibility relations for screen readers like Orca (!92) * Fix partition creation at sector 2048 if partition before it (#172, !93) * Make more getter methods use return-by-constant-reference (!94) * Check copy destination instead of source (!95) * Add bcache detection (#183, !96) * Add JBD external EXT3/4 journal detection (#89, !97) * Fix translation of DocBook markup tag of the GParted Manual (!98) Code Credits Code enhancements are courtesy of Movie Ma, Pascal Engélibert, and Mike Fleetwood. Translations (new/updated) -- cs(Marek Černocký), da(Alan Mortensen), eu(Asier Sarasua Garmendia), fur(Fabio Tomat), he(Yaron Shahrabani), hr(Goran Vidović), hu(Balázs Úr), id(Andika Triwidada), it(Milo Casagrande), ko(Seong-ho Cho), lt(Aurimas Černius), lv(Rūdolfs Mazurs), nb(Kjell Cato Heskjestad), nl(Nathan Follens), pa(A S Alam), pt(Hugo Carvalho), ru(Aleksandr Melman, Sergej A), sk(Dušan Kazik), sl(Matej Urbančič), sr(Мирослав Николић), zh_CN(Luming Zh) Dependencies (new/updated) -- * n/a Signed-off-by: Markus Volk --- .../files/0001-use-posix-basename.patch | 30 +++ .../{gparted_1.3.1.bb => gparted_1.4.0.bb} | 6 ++-- 2 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 meta-gnome/recipes-extended/gparted/files/0001-use-posix-basename.patch rename meta-gnome/recipes-extended/gparted/{gparted_1.3.1.bb => gparted_1.4.0.bb} (83%) diff --git a/meta-gnome/recipes-extended/gparted/files/0001-use-posix-basename.patch b/meta-gnome/recipes-extended/gparted/files/0001-use-posix-basename.patch new file mode 100644 index 0..aae200e27 --- /dev/null +++ b/meta-gnome/recipes-extended/gparted/files/0001-use-posix-basename.patch @@ -0,0 +1,30 @@ +Subject: [PATCH] BCache_Info.cc: use posix basename + +gnu 'basename' is undeclared for cplusplus if using musl. Use posix basename instead. + +fdebug-prefix-map=TOPDIR/build/tmp/work/cortexa57-yoe-linux-musl/gparted/1.4.0-r0/ +recipe-sysroot-native=-fvisibility-inlines-hidden -c -o Dialog_Disklabel.o ../../ +gparted-1.4.0/src/Dialog_Disklabel.cc ../../gparted-1.4.0/src/BCache_Info.cc:52:33: + +error: use of undeclared identifier 'basename'; did you mean 'g_basename'? + return "/dev/" + Glib::ustring(basename(buf)); + ^~~~ + g_basename + +Signed-off-by: Markus Volk + +Upstream-Status: Submitted + +https://gitlab.gnome.org/GNOME/gparted/-/merge_requests/99 + +--- a/src/BCache_Info.cc 2022-03-02 22:04:17.0 +0100 b/src/BCache_Info.cc 2022-04-09 15:02:56.932218665 +0200 +@@ -17,7 +17,7 @@ + + #include "BCache_Info.h" + +-#include // GNU version of basename() ++#include // POSIX version of basename() + #include + #include + #include diff --git a/meta-gnome/recipes-extended/gparted/gparted_1.3.1.bb b/meta-gnome/recipes-extended/gparted/gparted_1.4.0.bb similarity index 83% rename from meta-gnome/recipes-extended/gparted/gparted_1.3.1.bb rename to meta-gnome/recipes-extended/gparted/gparted_1.4.0.bb index d1a975930..6f774904b 100644 --- a/meta-gnome/recipes-extended/gparted/gparted_1.3.1.bb +++ b/meta-gnome/recipes-extended/gparted/gparted_1.4.0.bb @@ -3,16 +3,16 @@ HOMEPAGE = "http://gparted.org/index.php"; LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -inherit features_check autotools pkgconfig python3native gnome-help gtk-icon-cache +inherit autotools pkgconfig python3native gnome-help gtk-icon-cache -REQUIRED_DISTRO_FEATURES = "x11" SRC_URI = " \
[oe] [meta-oe][PATCH] wxwidgets: Fix build without x11 and with opengl DISTRO_FEATURES
In case DISTRO_FEATURES contains both 'x11' and 'opengl', which is a valid use case for systems using e.g. WL instead, the PACKAGECONFIG of this recipe is expanded to 'no_gui opengl', and the 'no_gui' option conflicts with 'opengl'. Adjust the default PACKAGECONFIG such that 'opengl' is added only in case the 'gtk' GUI option is added, and not when the 'no_gui' option is added. Signed-off-by: Marek Vasut --- meta-oe/recipes-extended/wxwidgets/wxwidgets_3.1.5.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.1.5.bb b/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.1.5.bb index e82143040..0c0c8417b 100644 --- a/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.1.5.bb +++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.1.5.bb @@ -44,8 +44,7 @@ EXTRA_OECMAKE:append:libc-musl = " \ " # All toolkit-configs except 'no_gui' require x11 explicitly (see toolkit.cmake) -PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk', 'no_gui', d)} \ -${@bb.utils.filter('DISTRO_FEATURES', 'opengl', d)} \ +PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk ' + bb.utils.filter('DISTRO_FEATURES', 'opengl', d), 'no_gui', d)} \ " PACKAGECONFIG:remove:class-native = "opengl" -- 2.35.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#96501): https://lists.openembedded.org/g/openembedded-devel/message/96501 Mute This Topic: https://lists.openembedded.org/mt/90362621/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [oe] [meta-oe][PATCH] wxwidgets: Fix build without x11 and with opengl DISTRO_FEATURES
There is already a patch staged in master-next https://lists.openembedded.org/g/openembedded-devel/message/96479 does that solve the problem? On Sat, Apr 9, 2022 at 12:46 PM Marek Vasut wrote: > > In case DISTRO_FEATURES contains both 'x11' and 'opengl', which is a > valid use case for systems using e.g. WL instead, the PACKAGECONFIG > of this recipe is expanded to 'no_gui opengl', and the 'no_gui' option > conflicts with 'opengl'. > > Adjust the default PACKAGECONFIG such that 'opengl' is added only in > case the 'gtk' GUI option is added, and not when the 'no_gui' option > is added. > > Signed-off-by: Marek Vasut > --- > meta-oe/recipes-extended/wxwidgets/wxwidgets_3.1.5.bb | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.1.5.bb > b/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.1.5.bb > index e82143040..0c0c8417b 100644 > --- a/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.1.5.bb > +++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.1.5.bb > @@ -44,8 +44,7 @@ EXTRA_OECMAKE:append:libc-musl = " \ > " > > # All toolkit-configs except 'no_gui' require x11 explicitly (see > toolkit.cmake) > -PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk', > 'no_gui', d)} \ > -${@bb.utils.filter('DISTRO_FEATURES', 'opengl', d)} \ > +PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk ' + > bb.utils.filter('DISTRO_FEATURES', 'opengl', d), 'no_gui', d)} \ > " > > PACKAGECONFIG:remove:class-native = "opengl" > -- > 2.35.1 > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#96502): https://lists.openembedded.org/g/openembedded-devel/message/96502 Mute This Topic: https://lists.openembedded.org/mt/90362621/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH] libcereal: Disable on ppc64
It does not support 128-bit long doubles Signed-off-by: Khem Raj --- meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb | 2 +- meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index 08d9e91704..bdd62eadfd 100644 --- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb @@ -949,7 +949,7 @@ RDEPENDS:packagegroup-meta-oe-support:remove:mipsarch = "gperftools" RDEPENDS:packagegroup-meta-oe-support:remove:riscv64 = "gperftools uim" RDEPENDS:packagegroup-meta-oe-support:remove:riscv32 = "gperftools uim" RDEPENDS:packagegroup-meta-oe-support:remove:powerpc = "ssiapi tbb" -RDEPENDS:packagegroup-meta-oe-support:remove:powerpc64le = "ssiapi" +RDEPENDS:packagegroup-meta-oe-support:remove:powerpc64le = "libcereal ssiapi" RDEPENDS:packagegroup-meta-oe-support:remove:libc-musl = "pcp" RDEPENDS:packagegroup-meta-oe-support:remove:libc-musl:powerpc = "gsl" diff --git a/meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb b/meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb index b76cd2eb60..fbd0ce1aad 100644 --- a/meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb +++ b/meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb @@ -44,3 +44,6 @@ ALLOW_EMPTY:${PN} = "1" RDEPENDS:${PN}-dev = "" BBCLASSEXTEND = "native nativesdk" + +#it needs to work with CXXFLAGS += " -mlong-double-64" but ppc64 only supports 128bit long double +COMPATIBLE_HOST:powerpc64le = "null" -- 2.35.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#96503): https://lists.openembedded.org/g/openembedded-devel/message/96503 Mute This Topic: https://lists.openembedded.org/mt/90364027/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [oe] [meta-oe][PATCH] wxwidgets: Fix build without x11 and with opengl DISTRO_FEATURES
On 4/9/22 21:53, Khem Raj wrote: There is already a patch staged in master-next https://lists.openembedded.org/g/openembedded-devel/message/96479 does that solve the problem? That patch from Scott is even better, thanks ! -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#96504): https://lists.openembedded.org/g/openembedded-devel/message/96504 Mute This Topic: https://lists.openembedded.org/mt/90362621/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-