[oe] [meta-oe][PATCH] libotr: Include missing sys/socket.h header

2022-04-08 Thread Khem Raj
Signed-off-by: Khem Raj 
---
 ...-Include-missing-sys-socket.h-header.patch | 31 +++
 .../recipes-support/pidgin/libotr_4.1.1.bb|  1 +
 2 files changed, 32 insertions(+)
 create mode 100644 
meta-oe/recipes-support/pidgin/libotr/0001-tests-Include-missing-sys-socket.h-header.patch

diff --git 
a/meta-oe/recipes-support/pidgin/libotr/0001-tests-Include-missing-sys-socket.h-header.patch
 
b/meta-oe/recipes-support/pidgin/libotr/0001-tests-Include-missing-sys-socket.h-header.patch
new file mode 100644
index 00..5b2e14b7b9
--- /dev/null
+++ 
b/meta-oe/recipes-support/pidgin/libotr/0001-tests-Include-missing-sys-socket.h-header.patch
@@ -0,0 +1,31 @@
+From aa2362e50d54fce8464d85766f5b230bf453c1f0 Mon Sep 17 00:00:00 2001
+From: Khem Raj 
+Date: Fri, 8 Apr 2022 20:15:03 -0700
+Subject: [PATCH] tests: Include missing sys/socket.h header
+
+Helps define
+| ../../../../libotr-4.1.1/tests/regression/client/client.c:979:21: error: use 
of undeclared identifier 'PF_UNIX'
+| ../../../../libotr-4.1.1/tests/regression/client/client.c:979:30: error: use 
of undeclared identifier 'SOCK_STREAM'
+| ../../../../libotr-4.1.1/tests/regression/client/client.c:986:20: error: use 
of undeclared identifier 'AF_UNIX'
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj 
+---
+ tests/regression/client/client.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tests/regression/client/client.c 
b/tests/regression/client/client.c
+index e72b661..e0b3453 100644
+--- a/tests/regression/client/client.c
 b/tests/regression/client/client.c
+@@ -26,6 +26,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 
+-- 
+2.35.1
+
diff --git a/meta-oe/recipes-support/pidgin/libotr_4.1.1.bb 
b/meta-oe/recipes-support/pidgin/libotr_4.1.1.bb
index d9e0e1caa2..115a6968eb 100644
--- a/meta-oe/recipes-support/pidgin/libotr_4.1.1.bb
+++ b/meta-oe/recipes-support/pidgin/libotr_4.1.1.bb
@@ -7,6 +7,7 @@ DEPENDS = "libgcrypt libgpg-error"
 SRC_URI = "http://www.cypherpunks.ca/otr/${BP}.tar.gz \
file://fix_qa-issue_include.patch \
file://sepbuild.patch \
+   file://0001-tests-Include-missing-sys-socket.h-header.patch \
 "
 
 SRC_URI[md5sum] = "dac5a8778a35f674c046ddf5d97e4d81"
-- 
2.35.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#96493): 
https://lists.openembedded.org/g/openembedded-devel/message/96493
Mute This Topic: https://lists.openembedded.org/mt/90350418/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



Re: [oe] [PATCH] wxwidgets: Fix building without x11

2022-04-08 Thread Robert Yang



On 4/9/22 01:41, Khem Raj wrote:

On Fri, Apr 8, 2022 at 10:36 AM Scott Murray  wrote:


On Fri, 8 Apr 2022, Scott Murray via lists.openembedded.org wrote:


Building with wayland and opengl in DISTRO_FEATURES without x11 as
well was giving the error:

wxwidgets: PACKAGECONFIG[no_gui] Conflict package config 'opengl' set in 
PACKAGECONFIG.

Upon some investigation, it looks like wxwidgets now supports building
against Gtk's Wayland support, so we can also enable it if wayland is
in DISTRO_FEATURES.  For OpenGL, however, wxwidgets seems to have a
dependency on libglu, so the DISTRO_FEATURES check has been changed
to only enable it by default if both x11 and opengl are configured.

Signed-off-by: Scott Murray 
---
  meta-oe/recipes-extended/wxwidgets/wxwidgets_3.1.5.bb | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)


I hadn't checked the list before sending this, I'd be okay with Robert's
similar fix instead, though enabling building with wayland support seems
like it potentially could be useful to somebody.


I have taken the latter fix since it was fixing wayland too.


The fix looks good to me, thanks.

// Robert







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..e7e89d64a 100644
--- a/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.1.5.bb
+++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.1.5.bb
@@ -43,9 +43,9 @@ EXTRA_OECMAKE:append:libc-musl = " \
  -DHAVE_LOCALE_T=OFF \
  "

-# 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)} \
+# OpenGL support currently seems tied to using libglu, which requires x11
+PACKAGECONFIG ?= "${@bb.utils.contains_any('DISTRO_FEATURES', 'x11 wayland', 
'gtk', 'no_gui', d)} \
+${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'opengl', '', d)} \
  "

  PACKAGECONFIG:remove:class-native = "opengl"






-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#96492): 
https://lists.openembedded.org/g/openembedded-devel/message/96492
Mute This Topic: https://lists.openembedded.org/mt/90338460/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] ndctl: Remove run test of typeof

2022-04-08 Thread Khem Raj
Cool, thanks!

On Fri, Apr 8, 2022 at 7:31 PM Jeremy Puhlman  wrote:

> Yeah I saw that later in the day, it addresses the same issue.
>
> On Fri, Apr 8, 2022, 12:54 PM Khem Raj  wrote:
>
>> there is a patch in master-next
>>
>> https://lists.openembedded.org/g/openembedded-devel/message/96468
>>
>> does this solve your issue ?
>>
>> On 4/8/22 12:42 PM, Jeremy Puhlman wrote:
>> > ../git/meson.build:213:0: ERROR: Can not run test applications in this
>> cross environment.
>> >
>> > Signed-off-by: Jeremy A. Puhlman 
>> > ---
>> >   ...sume-typeof-exists-in-our-modern-gcc.patch | 45 +++
>> >   meta-oe/recipes-core/ndctl/ndctl_v73.bb   |  4 +-
>> >   2 files changed, 48 insertions(+), 1 deletion(-)
>> >   create mode 100644
>> meta-oe/recipes-core/ndctl/ndctl/0001-Assume-typeof-exists-in-our-modern-gcc.patch
>> >
>> > diff --git
>> a/meta-oe/recipes-core/ndctl/ndctl/0001-Assume-typeof-exists-in-our-modern-gcc.patch
>> b/meta-oe/recipes-core/ndctl/ndctl/0001-Assume-typeof-exists-in-our-modern-gcc.patch
>> > new file mode 100644
>> > index 0..b47510a6b
>> > --- /dev/null
>> > +++
>> b/meta-oe/recipes-core/ndctl/ndctl/0001-Assume-typeof-exists-in-our-modern-gcc.patch
>> > @@ -0,0 +1,45 @@
>> > +From 3abfe16bf2eb89efe3c823a935a6752c4a5b99d1 Mon Sep 17 00:00:00 2001
>> > +From: "Jeremy A. Puhlman" 
>> > +Date: Fri, 8 Apr 2022 19:31:02 +
>> > +Subject: [PATCH] Assume typeof exists in our modern gcc
>> > +
>> > +cc.run tests are not useful in a cross environment.
>> > +
>> > +Upstream-Status: Inappropriate [Assumes modern compiler]
>> > +Signed-off-by: Jeremy A. Puhlman 
>> > +---
>> > + meson.build | 18 ++
>> > + 1 file changed, 2 insertions(+), 16 deletions(-)
>> > +
>> > +diff --git a/meson.build b/meson.build
>> > +index 42e11aa..e8d218b 100644
>> > +--- a/meson.build
>> >  b/meson.build
>> > +@@ -210,22 +210,8 @@ conf.set('ENABLE_DESTRUCTIVE',
>> get_option('destructive').enabled())
>> > + conf.set('ENABLE_LOGGING', get_option('logging').enabled())
>> > + conf.set('ENABLE_DEBUG', get_option('dbg').enabled())
>> > +
>> > +-typeof = cc.run('''
>> > +-  int main() {
>> > +-struct {
>> > +-  char a[16];
>> > +-} x;
>> > +-typeof(x) y;
>> > +-
>> > +-return sizeof(x) == sizeof(y);
>> > +-  }
>> > +-  '''
>> > +-)
>> > +-
>> > +-if typeof.compiled() and typeof.returncode() == 1
>> > +-  conf.set('HAVE_TYPEOF', 1)
>> > +-  conf.set('HAVE_STATEMENT_EXPR', 1)
>> > +-endif
>> > ++conf.set('HAVE_TYPEOF', 1)
>> > ++conf.set('HAVE_STATEMENT_EXPR', 1)
>> > +
>> > + if target_machine.endian() == 'big'
>> > +   conf.set('HAVE_BIG_ENDIAN', 1)
>> > +--
>> > +2.33.0
>> > +
>> > diff --git a/meta-oe/recipes-core/ndctl/ndctl_v73.bb
>> b/meta-oe/recipes-core/ndctl/ndctl_v73.bb
>> > index c88d39297..e2049ce2f 100644
>> > --- a/meta-oe/recipes-core/ndctl/ndctl_v73.bb
>> > +++ b/meta-oe/recipes-core/ndctl/ndctl_v73.bb
>> > @@ -13,7 +13,9 @@ inherit meson pkgconfig bash-completion systemd
>> >   SRCREV = "dd58d43458943d20ff063850670bf54a5242c9c5"
>> >   SRC_URI = "git://github.com/pmem/ndctl.git;branch=main;protocol=https
>> \
>> >  file://0001-util-Correct-path-to-iniparser.h.patch \
>> > -   file://0001-meson-Use-pkg-config-to-detect-iniparser.patch"
>> > +   file://0001-meson-Use-pkg-config-to-detect-iniparser.patch \
>> > +   file://0001-Assume-typeof-exists-in-our-modern-gcc.patch \
>> > +"
>> >
>> >   UPSTREAM_CHECK_GITTAGREGEX = "(?Pv\d+(\.\d+)*)"
>> >
>> >
>> >
>> >
>> >
>> >
>>
>> 
>>
>>

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#96491): 
https://lists.openembedded.org/g/openembedded-devel/message/96491
Mute This Topic: https://lists.openembedded.org/mt/90343683/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] ndctl: Remove run test of typeof

2022-04-08 Thread Jeremy Puhlman
Yeah I saw that later in the day, it addresses the same issue.

On Fri, Apr 8, 2022, 12:54 PM Khem Raj  wrote:

> there is a patch in master-next
>
> https://lists.openembedded.org/g/openembedded-devel/message/96468
>
> does this solve your issue ?
>
> On 4/8/22 12:42 PM, Jeremy Puhlman wrote:
> > ../git/meson.build:213:0: ERROR: Can not run test applications in this
> cross environment.
> >
> > Signed-off-by: Jeremy A. Puhlman 
> > ---
> >   ...sume-typeof-exists-in-our-modern-gcc.patch | 45 +++
> >   meta-oe/recipes-core/ndctl/ndctl_v73.bb   |  4 +-
> >   2 files changed, 48 insertions(+), 1 deletion(-)
> >   create mode 100644
> meta-oe/recipes-core/ndctl/ndctl/0001-Assume-typeof-exists-in-our-modern-gcc.patch
> >
> > diff --git
> a/meta-oe/recipes-core/ndctl/ndctl/0001-Assume-typeof-exists-in-our-modern-gcc.patch
> b/meta-oe/recipes-core/ndctl/ndctl/0001-Assume-typeof-exists-in-our-modern-gcc.patch
> > new file mode 100644
> > index 0..b47510a6b
> > --- /dev/null
> > +++
> b/meta-oe/recipes-core/ndctl/ndctl/0001-Assume-typeof-exists-in-our-modern-gcc.patch
> > @@ -0,0 +1,45 @@
> > +From 3abfe16bf2eb89efe3c823a935a6752c4a5b99d1 Mon Sep 17 00:00:00 2001
> > +From: "Jeremy A. Puhlman" 
> > +Date: Fri, 8 Apr 2022 19:31:02 +
> > +Subject: [PATCH] Assume typeof exists in our modern gcc
> > +
> > +cc.run tests are not useful in a cross environment.
> > +
> > +Upstream-Status: Inappropriate [Assumes modern compiler]
> > +Signed-off-by: Jeremy A. Puhlman 
> > +---
> > + meson.build | 18 ++
> > + 1 file changed, 2 insertions(+), 16 deletions(-)
> > +
> > +diff --git a/meson.build b/meson.build
> > +index 42e11aa..e8d218b 100644
> > +--- a/meson.build
> >  b/meson.build
> > +@@ -210,22 +210,8 @@ conf.set('ENABLE_DESTRUCTIVE',
> get_option('destructive').enabled())
> > + conf.set('ENABLE_LOGGING', get_option('logging').enabled())
> > + conf.set('ENABLE_DEBUG', get_option('dbg').enabled())
> > +
> > +-typeof = cc.run('''
> > +-  int main() {
> > +-struct {
> > +-  char a[16];
> > +-} x;
> > +-typeof(x) y;
> > +-
> > +-return sizeof(x) == sizeof(y);
> > +-  }
> > +-  '''
> > +-)
> > +-
> > +-if typeof.compiled() and typeof.returncode() == 1
> > +-  conf.set('HAVE_TYPEOF', 1)
> > +-  conf.set('HAVE_STATEMENT_EXPR', 1)
> > +-endif
> > ++conf.set('HAVE_TYPEOF', 1)
> > ++conf.set('HAVE_STATEMENT_EXPR', 1)
> > +
> > + if target_machine.endian() == 'big'
> > +   conf.set('HAVE_BIG_ENDIAN', 1)
> > +--
> > +2.33.0
> > +
> > diff --git a/meta-oe/recipes-core/ndctl/ndctl_v73.bb
> b/meta-oe/recipes-core/ndctl/ndctl_v73.bb
> > index c88d39297..e2049ce2f 100644
> > --- a/meta-oe/recipes-core/ndctl/ndctl_v73.bb
> > +++ b/meta-oe/recipes-core/ndctl/ndctl_v73.bb
> > @@ -13,7 +13,9 @@ inherit meson pkgconfig bash-completion systemd
> >   SRCREV = "dd58d43458943d20ff063850670bf54a5242c9c5"
> >   SRC_URI = "git://github.com/pmem/ndctl.git;branch=main;protocol=https
> \
> >  file://0001-util-Correct-path-to-iniparser.h.patch \
> > -   file://0001-meson-Use-pkg-config-to-detect-iniparser.patch"
> > +   file://0001-meson-Use-pkg-config-to-detect-iniparser.patch \
> > +   file://0001-Assume-typeof-exists-in-our-modern-gcc.patch \
> > +"
> >
> >   UPSTREAM_CHECK_GITTAGREGEX = "(?Pv\d+(\.\d+)*)"
> >
> >
> >
> >
> >
> >
>
> 
>
>

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#96490): 
https://lists.openembedded.org/g/openembedded-devel/message/96490
Mute This Topic: https://lists.openembedded.org/mt/90343683/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



[oe] [PATCH] grpc: remove unused patches

2022-04-08 Thread Clément Péron
These patches are not used by the grpc recipe so remove them.

Signed-off-by: Clément Péron 
---
 ...8fb0ee826e73323e06ac6166ac038ee71f6a.patch | 107 --
 .../grpc/0001-gsec-Fix-build-on-musl.patch|  37 --
 2 files changed, 144 deletions(-)
 delete mode 100644 
meta-oe/recipes-devtools/grpc/grpc/0001-cmake-revert-db88fb0ee826e73323e06ac6166ac038ee71f6a.patch
 delete mode 100644 
meta-oe/recipes-devtools/grpc/grpc/0001-gsec-Fix-build-on-musl.patch

diff --git 
a/meta-oe/recipes-devtools/grpc/grpc/0001-cmake-revert-db88fb0ee826e73323e06ac6166ac038ee71f6a.patch
 
b/meta-oe/recipes-devtools/grpc/grpc/0001-cmake-revert-db88fb0ee826e73323e06ac6166ac038ee71f6a.patch
deleted file mode 100644
index d9cfa009f9..00
--- 
a/meta-oe/recipes-devtools/grpc/grpc/0001-cmake-revert-db88fb0ee826e73323e06ac6166ac038ee71f6a.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-From 50d54458324c1a19eefb9968e4cb556dbd34b875 Mon Sep 17 00:00:00 2001
-From: Vyacheslav Yurkov 
-Date: Tue, 12 Oct 2021 19:11:40 +0200
-Subject: [PATCH] cmake: revert db88fb0ee826e73323e06ac6166ac038ee71f6a
- (#27626)
-
-Fix regression introduced by previous commit. Original problem that
-commit was trying to fix was solved by modification of grpc recipe in
-meta-openembedded project repository
-
-Fixes #26857
-
-Signed-off-by: Vyacheslav Yurkov 

- CMakeLists.txt| 16 
- templates/CMakeLists.txt.template |  2 --
- 2 files changed, 8 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0e8fbdee8b..02cd48bee4 100644
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -3828,7 +3828,7 @@ foreach(_hdr
- endforeach()
- 
- 
--if(gRPC_INSTALL AND NOT CMAKE_CROSSCOMPILING)
-+if(gRPC_INSTALL)
-   install(TARGETS grpc_plugin_support EXPORT gRPCTargets
- RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR}
- LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR}
-@@ -11679,7 +11679,7 @@ target_link_libraries(grpc_cpp_plugin
- 
- 
- 
--if(gRPC_INSTALL AND NOT CMAKE_CROSSCOMPILING)
-+if(gRPC_INSTALL)
-   install(TARGETS grpc_cpp_plugin EXPORT gRPCTargets
- RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR}
- LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR}
-@@ -11718,7 +11718,7 @@ target_link_libraries(grpc_csharp_plugin
- 
- 
- 
--if(gRPC_INSTALL AND NOT CMAKE_CROSSCOMPILING)
-+if(gRPC_INSTALL)
-   install(TARGETS grpc_csharp_plugin EXPORT gRPCTargets
- RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR}
- LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR}
-@@ -11757,7 +11757,7 @@ target_link_libraries(grpc_node_plugin
- 
- 
- 
--if(gRPC_INSTALL AND NOT CMAKE_CROSSCOMPILING)
-+if(gRPC_INSTALL)
-   install(TARGETS grpc_node_plugin EXPORT gRPCTargets
- RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR}
- LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR}
-@@ -11796,7 +11796,7 @@ target_link_libraries(grpc_objective_c_plugin
- 
- 
- 
--if(gRPC_INSTALL AND NOT CMAKE_CROSSCOMPILING)
-+if(gRPC_INSTALL)
-   install(TARGETS grpc_objective_c_plugin EXPORT gRPCTargets
- RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR}
- LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR}
-@@ -11835,7 +11835,7 @@ target_link_libraries(grpc_php_plugin
- 
- 
- 
--if(gRPC_INSTALL AND NOT CMAKE_CROSSCOMPILING)
-+if(gRPC_INSTALL)
-   install(TARGETS grpc_php_plugin EXPORT gRPCTargets
- RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR}
- LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR}
-@@ -11874,7 +11874,7 @@ target_link_libraries(grpc_python_plugin
- 
- 
- 
--if(gRPC_INSTALL AND NOT CMAKE_CROSSCOMPILING)
-+if(gRPC_INSTALL)
-   install(TARGETS grpc_python_plugin EXPORT gRPCTargets
- RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR}
- LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR}
-@@ -11913,7 +11913,7 @@ target_link_libraries(grpc_ruby_plugin
- 
- 
- 
--if(gRPC_INSTALL AND NOT CMAKE_CROSSCOMPILING)
-+if(gRPC_INSTALL)
-   install(TARGETS grpc_ruby_plugin EXPORT gRPCTargets
- RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR}
- LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR}
-diff --git a/templates/CMakeLists.txt.template 
b/templates/CMakeLists.txt.template
-index 0f0883e09c..b9a5bc4144 100644
 a/templates/CMakeLists.txt.template
-+++ b/templates/CMakeLists.txt.template
-@@ -695,8 +695,6 @@
-   # grpcpp_channelz doesn't build with protobuf-lite, so no install required
-   # See https://github.com/grpc/grpc/issues/22826
-   if(gRPC_INSTALL AND NOT gRPC_USE_PROTO_LITE)
--  % elif tgt.build == 'protoc':
--  if(gRPC_INSTALL AND NOT CMAKE_CROSSCOMPILING)
-   % else:
-   if(gRPC_INSTALL)
-   % endif
diff --git 
a/meta-oe/recipes-devtools/grpc/grpc/0001-gsec-Fix-build-on-musl.patch 
b/meta-oe/recipes-devtools/grpc/grpc/0001-gsec-Fix-build-on-musl.patch
deleted file mode 100644
index faa18bb7f7..00
--- a/meta-oe/recipes-devtools/grpc/grpc/0001-gsec-Fix-build-on-musl.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 9af185be6068d279736c0d2b2162a4e768444d3d Mon Sep 17 00:00:00 2001
-From: Khem Raj 
-Date: Sat, 29 May 2021 00:41:32 -0700
-Subject: [PATCH] gsec: Fix build on musl

Re: [oe] [meta-oe][PATCH] ndctl: Remove run test of typeof

2022-04-08 Thread Khem Raj

there is a patch in master-next

https://lists.openembedded.org/g/openembedded-devel/message/96468

does this solve your issue ?

On 4/8/22 12:42 PM, Jeremy Puhlman wrote:

../git/meson.build:213:0: ERROR: Can not run test applications in this cross 
environment.

Signed-off-by: Jeremy A. Puhlman 
---
  ...sume-typeof-exists-in-our-modern-gcc.patch | 45 +++
  meta-oe/recipes-core/ndctl/ndctl_v73.bb   |  4 +-
  2 files changed, 48 insertions(+), 1 deletion(-)
  create mode 100644 
meta-oe/recipes-core/ndctl/ndctl/0001-Assume-typeof-exists-in-our-modern-gcc.patch

diff --git 
a/meta-oe/recipes-core/ndctl/ndctl/0001-Assume-typeof-exists-in-our-modern-gcc.patch
 
b/meta-oe/recipes-core/ndctl/ndctl/0001-Assume-typeof-exists-in-our-modern-gcc.patch
new file mode 100644
index 0..b47510a6b
--- /dev/null
+++ 
b/meta-oe/recipes-core/ndctl/ndctl/0001-Assume-typeof-exists-in-our-modern-gcc.patch
@@ -0,0 +1,45 @@
+From 3abfe16bf2eb89efe3c823a935a6752c4a5b99d1 Mon Sep 17 00:00:00 2001
+From: "Jeremy A. Puhlman" 
+Date: Fri, 8 Apr 2022 19:31:02 +
+Subject: [PATCH] Assume typeof exists in our modern gcc
+
+cc.run tests are not useful in a cross environment.
+
+Upstream-Status: Inappropriate [Assumes modern compiler]
+Signed-off-by: Jeremy A. Puhlman 
+---
+ meson.build | 18 ++
+ 1 file changed, 2 insertions(+), 16 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 42e11aa..e8d218b 100644
+--- a/meson.build
 b/meson.build
+@@ -210,22 +210,8 @@ conf.set('ENABLE_DESTRUCTIVE', 
get_option('destructive').enabled())
+ conf.set('ENABLE_LOGGING', get_option('logging').enabled())
+ conf.set('ENABLE_DEBUG', get_option('dbg').enabled())
+
+-typeof = cc.run('''
+-  int main() {
+-struct {
+-  char a[16];
+-} x;
+-typeof(x) y;
+-
+-return sizeof(x) == sizeof(y);
+-  }
+-  '''
+-)
+-
+-if typeof.compiled() and typeof.returncode() == 1
+-  conf.set('HAVE_TYPEOF', 1)
+-  conf.set('HAVE_STATEMENT_EXPR', 1)
+-endif
++conf.set('HAVE_TYPEOF', 1)
++conf.set('HAVE_STATEMENT_EXPR', 1)
+
+ if target_machine.endian() == 'big'
+   conf.set('HAVE_BIG_ENDIAN', 1)
+--
+2.33.0
+
diff --git a/meta-oe/recipes-core/ndctl/ndctl_v73.bb 
b/meta-oe/recipes-core/ndctl/ndctl_v73.bb
index c88d39297..e2049ce2f 100644
--- a/meta-oe/recipes-core/ndctl/ndctl_v73.bb
+++ b/meta-oe/recipes-core/ndctl/ndctl_v73.bb
@@ -13,7 +13,9 @@ inherit meson pkgconfig bash-completion systemd
  SRCREV = "dd58d43458943d20ff063850670bf54a5242c9c5"
  SRC_URI = "git://github.com/pmem/ndctl.git;branch=main;protocol=https \
 file://0001-util-Correct-path-to-iniparser.h.patch \
-   file://0001-meson-Use-pkg-config-to-detect-iniparser.patch"
+   file://0001-meson-Use-pkg-config-to-detect-iniparser.patch \
+   file://0001-Assume-typeof-exists-in-our-modern-gcc.patch \
+"
  
  UPSTREAM_CHECK_GITTAGREGEX = "(?Pv\d+(\.\d+)*)"
  







-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#96488): 
https://lists.openembedded.org/g/openembedded-devel/message/96488
Mute This Topic: https://lists.openembedded.org/mt/90343683/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] ndctl: Remove run test of typeof

2022-04-08 Thread Jeremy Puhlman
../git/meson.build:213:0: ERROR: Can not run test applications in this cross 
environment.

Signed-off-by: Jeremy A. Puhlman 
---
 ...sume-typeof-exists-in-our-modern-gcc.patch | 45 +++
 meta-oe/recipes-core/ndctl/ndctl_v73.bb   |  4 +-
 2 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 
meta-oe/recipes-core/ndctl/ndctl/0001-Assume-typeof-exists-in-our-modern-gcc.patch

diff --git 
a/meta-oe/recipes-core/ndctl/ndctl/0001-Assume-typeof-exists-in-our-modern-gcc.patch
 
b/meta-oe/recipes-core/ndctl/ndctl/0001-Assume-typeof-exists-in-our-modern-gcc.patch
new file mode 100644
index 0..b47510a6b
--- /dev/null
+++ 
b/meta-oe/recipes-core/ndctl/ndctl/0001-Assume-typeof-exists-in-our-modern-gcc.patch
@@ -0,0 +1,45 @@
+From 3abfe16bf2eb89efe3c823a935a6752c4a5b99d1 Mon Sep 17 00:00:00 2001
+From: "Jeremy A. Puhlman" 
+Date: Fri, 8 Apr 2022 19:31:02 +
+Subject: [PATCH] Assume typeof exists in our modern gcc
+
+cc.run tests are not useful in a cross environment.
+
+Upstream-Status: Inappropriate [Assumes modern compiler]
+Signed-off-by: Jeremy A. Puhlman 
+---
+ meson.build | 18 ++
+ 1 file changed, 2 insertions(+), 16 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 42e11aa..e8d218b 100644
+--- a/meson.build
 b/meson.build
+@@ -210,22 +210,8 @@ conf.set('ENABLE_DESTRUCTIVE', 
get_option('destructive').enabled())
+ conf.set('ENABLE_LOGGING', get_option('logging').enabled())
+ conf.set('ENABLE_DEBUG', get_option('dbg').enabled())
+ 
+-typeof = cc.run('''
+-  int main() {
+-struct {
+-  char a[16];
+-} x;
+-typeof(x) y;
+-
+-return sizeof(x) == sizeof(y);
+-  }
+-  '''
+-)
+-
+-if typeof.compiled() and typeof.returncode() == 1
+-  conf.set('HAVE_TYPEOF', 1)
+-  conf.set('HAVE_STATEMENT_EXPR', 1)
+-endif
++conf.set('HAVE_TYPEOF', 1)
++conf.set('HAVE_STATEMENT_EXPR', 1)
+ 
+ if target_machine.endian() == 'big'
+   conf.set('HAVE_BIG_ENDIAN', 1)
+-- 
+2.33.0
+
diff --git a/meta-oe/recipes-core/ndctl/ndctl_v73.bb 
b/meta-oe/recipes-core/ndctl/ndctl_v73.bb
index c88d39297..e2049ce2f 100644
--- a/meta-oe/recipes-core/ndctl/ndctl_v73.bb
+++ b/meta-oe/recipes-core/ndctl/ndctl_v73.bb
@@ -13,7 +13,9 @@ inherit meson pkgconfig bash-completion systemd
 SRCREV = "dd58d43458943d20ff063850670bf54a5242c9c5"
 SRC_URI = "git://github.com/pmem/ndctl.git;branch=main;protocol=https \
file://0001-util-Correct-path-to-iniparser.h.patch \
-   file://0001-meson-Use-pkg-config-to-detect-iniparser.patch"
+   file://0001-meson-Use-pkg-config-to-detect-iniparser.patch \
+   file://0001-Assume-typeof-exists-in-our-modern-gcc.patch \
+"
 
 UPSTREAM_CHECK_GITTAGREGEX = "(?Pv\d+(\.\d+)*)"
 
-- 
2.33.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#96487): 
https://lists.openembedded.org/g/openembedded-devel/message/96487
Mute This Topic: https://lists.openembedded.org/mt/90343683/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] Revert "python3-cppy: upgrade 1.2.0 -> 1.2.1"

2022-04-08 Thread Khem Raj
This reverts commit c4c2a90040bf3ab472d3d1a733bbda47d5f86ec6.

This update fails to build python3-kiwisolver, it works ok with 1.2.0

Signed-off-by: Khem Raj 
Cc: Wang Mingyu 
---
 .../python/{python3-cppy_1.2.1.bb => python3-cppy_1.2.0.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-python/recipes-devtools/python/{python3-cppy_1.2.1.bb => 
python3-cppy_1.2.0.bb} (78%)

diff --git a/meta-python/recipes-devtools/python/python3-cppy_1.2.1.bb 
b/meta-python/recipes-devtools/python/python3-cppy_1.2.0.bb
similarity index 78%
rename from meta-python/recipes-devtools/python/python3-cppy_1.2.1.bb
rename to meta-python/recipes-devtools/python/python3-cppy_1.2.0.bb
index b84b46164c..f86f571938 100644
--- a/meta-python/recipes-devtools/python/python3-cppy_1.2.1.bb
+++ b/meta-python/recipes-devtools/python/python3-cppy_1.2.0.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "https://cppy.readthedocs.io/en/latest/";
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=0bfb3e39b13587f0028f17baf0e42371"
 
-SRC_URI[sha256sum] = 
"83b43bf17b1085ac15c5debdb42154f138b928234b21447358981f69d0d6fe1b"
+SRC_URI[sha256sum] = 
"95e8862e4f826c3f2a6b7b658333b162f80cbe9f943aa0d0a7a6b2ef850aeffc"
 
 RDEPENDS:${PN} += "python3-setuptools python3-distutils"
 
-- 
2.35.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#96486): 
https://lists.openembedded.org/g/openembedded-devel/message/96486
Mute This Topic: https://lists.openembedded.org/mt/90343425/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 v2 1/2] grpc: add cmake support for target

2022-04-08 Thread Clément Péron
Hi Stefan,

On Fri, 8 Apr 2022 at 14:47, Stefan Herbrechtsmeier
 wrote:
>
> Hi Clement,
>
> Am 08.04.2022 um 14:25 schrieb Clément Péron:
> > Hi Stefan,
> >
> > On Fri, 8 Apr 2022 at 09:30, Stefan Herbrechtsmeier
> >  wrote:
> >>
> >> From: Stefan Herbrechtsmeier 
> >>
> >> The CMake gRPC config checks for binaries and fails if a binary (plugin)
> >> is missing. Fix the problem in the code and add the CMake gRPC config
> >> back to the target package.
> >
> > Thanks for your patch, I'm still using gRPC 1.35 + your previous similar 
> > patch.
> > I'm trying to bump to gRPC 1.45.1 + these patches.
> >
> > My recipe use CMake and depends on grpc and grpc-native:
> > PACKAGECONFIG[grpc] = "-DCONFIG_GRPC=ON,-DCONFIG_GRPC=OFF,grpc grpc-native"
> >
> > But unfortunately CMake doesn't find the grpc_cpp_plugin.
>
> This is the correct behavior of my patch because the grpc_cpp_plugin
> from the cross build isn't usable during cross build. You need the
> grpc_cpp_plugin from the host and therefore have to search the
> grpc_cpp_plugin by yourself during cross compile [1].
>
> My first patch was rejected and therefore I create a minimal patch which
> only make the CMake gRPC config usable.
>
> >
> > | -- Using gRPC 1.45.1
> > 
> > | CMake Error at modules/grpc/CMakeLists.txt:37 (add_custom_command):
> > |   Error evaluating generator expression:
> > |
> > | $
> > |
> > |   No target "gRPC::grpc_cpp_plugin"
> > |
> > |
> > | CMake Error at modules/grpc/CMakeLists.txt:37 (add_custom_command):
> > |   Error evaluating generator expression:
> > |
> > | $
> > |
> > |   No target "gRPC::grpc_cpp_plugin"
> > |
> > |
> > | CMake Error at modules/grpc/CMakeLists.txt:37 (add_custom_command):
> > |   Error evaluating generator expression:
> > |
> > | $
> > |
> > |   No target "gRPC::grpc_cpp_plugin"
> >
> > Here is my CMake source file:
> >
> > # Find Protobuf installation Yocto SDK doensn't support 
> > protobuf-config.cmake
> > # for the moment
> > set(protobuf_MODULE_COMPATIBLE TRUE)
> > find_package(Protobuf REQUIRED)
> > message(STATUS "Using protobuf ${Protobuf_VERSION}")
> > set(_PROTOBUF_LIBPROTOBUF protobuf::libprotobuf)
> >
> > # Find gRPC installation Looks for gRPCConfig.cmake file installed by gRPC's
> > # cmake installation.
> > find_package(gRPC CONFIG REQUIRED)
> > message(STATUS "Using gRPC ${gRPC_VERSION}")
> > set(_REFLECTION gRPC::grpc++_reflection)
> > set(_GRPC_GRPCPP gRPC::grpc++)
> >
> > # Get full path of protobuf/gRPC compiler
> > set(_PROTOBUF_PROTOC $)
> > set(_GRPC_CPP_PLUGIN_EXECUTABLE $)
>
> You have to search the binaries if you cross compile [1]:
>
> if(CMAKE_CROSSCOMPILING)
>find_program(_GRPC_CPP_PLUGIN_EXECUTABLE grpc_cpp_plugin)
> else()
>set(_GRPC_CPP_PLUGIN_EXECUTABLE $)
> endif()

Thanks this fix my issue

Tested-by: Clément Péron 

>
> >
> > Do you have an example of how you look for gRPC in your recipe?
>
> This isn't possible because you use a target and not a variable.

Maybe a dumb question but how protobuf-compiler handle this?

Thanks,
Clement



>
> [1] https://github.com/grpc/grpc/blob/master/examples/cpp/cmake/common.cmake
>
> Regards
>Stefan

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#96485): 
https://lists.openembedded.org/g/openembedded-devel/message/96485
Mute This Topic: https://lists.openembedded.org/mt/90331029/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



Re: [oe] [PATCH] wxwidgets: Fix building without x11

2022-04-08 Thread Khem Raj
On Fri, Apr 8, 2022 at 10:36 AM Scott Murray  wrote:
>
> On Fri, 8 Apr 2022, Scott Murray via lists.openembedded.org wrote:
>
> > Building with wayland and opengl in DISTRO_FEATURES without x11 as
> > well was giving the error:
> >
> > wxwidgets: PACKAGECONFIG[no_gui] Conflict package config 'opengl' set in 
> > PACKAGECONFIG.
> >
> > Upon some investigation, it looks like wxwidgets now supports building
> > against Gtk's Wayland support, so we can also enable it if wayland is
> > in DISTRO_FEATURES.  For OpenGL, however, wxwidgets seems to have a
> > dependency on libglu, so the DISTRO_FEATURES check has been changed
> > to only enable it by default if both x11 and opengl are configured.
> >
> > Signed-off-by: Scott Murray 
> > ---
> >  meta-oe/recipes-extended/wxwidgets/wxwidgets_3.1.5.bb | 6 +++---
> >  1 file changed, 3 insertions(+), 3 deletions(-)
>
> I hadn't checked the list before sending this, I'd be okay with Robert's
> similar fix instead, though enabling building with wayland support seems
> like it potentially could be useful to somebody.

I have taken the latter fix since it was fixing wayland too.

>
> > 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..e7e89d64a 100644
> > --- a/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.1.5.bb
> > +++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.1.5.bb
> > @@ -43,9 +43,9 @@ EXTRA_OECMAKE:append:libc-musl = " \
> >  -DHAVE_LOCALE_T=OFF \
> >  "
> >
> > -# 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)} \
> > +# OpenGL support currently seems tied to using libglu, which requires x11
> > +PACKAGECONFIG ?= "${@bb.utils.contains_any('DISTRO_FEATURES', 'x11 
> > wayland', 'gtk', 'no_gui', d)} \
> > +${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'opengl', '', 
> > d)} \
> >  "
> >
> >  PACKAGECONFIG:remove:class-native = "opengl"
> >
>
> 
>

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#96484): 
https://lists.openembedded.org/g/openembedded-devel/message/96484
Mute This Topic: https://lists.openembedded.org/mt/90338460/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



Re: [oe] [PATCH] wxwidgets: Fix building without x11

2022-04-08 Thread Scott Murray
On Fri, 8 Apr 2022, Scott Murray via lists.openembedded.org wrote:

> Building with wayland and opengl in DISTRO_FEATURES without x11 as
> well was giving the error:
>
> wxwidgets: PACKAGECONFIG[no_gui] Conflict package config 'opengl' set in 
> PACKAGECONFIG.
>
> Upon some investigation, it looks like wxwidgets now supports building
> against Gtk's Wayland support, so we can also enable it if wayland is
> in DISTRO_FEATURES.  For OpenGL, however, wxwidgets seems to have a
> dependency on libglu, so the DISTRO_FEATURES check has been changed
> to only enable it by default if both x11 and opengl are configured.
>
> Signed-off-by: Scott Murray 
> ---
>  meta-oe/recipes-extended/wxwidgets/wxwidgets_3.1.5.bb | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)

I hadn't checked the list before sending this, I'd be okay with Robert's
similar fix instead, though enabling building with wayland support seems
like it potentially could be useful to somebody.

> 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..e7e89d64a 100644
> --- a/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.1.5.bb
> +++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.1.5.bb
> @@ -43,9 +43,9 @@ EXTRA_OECMAKE:append:libc-musl = " \
>  -DHAVE_LOCALE_T=OFF \
>  "
>
> -# 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)} \
> +# OpenGL support currently seems tied to using libglu, which requires x11
> +PACKAGECONFIG ?= "${@bb.utils.contains_any('DISTRO_FEATURES', 'x11 wayland', 
> 'gtk', 'no_gui', d)} \
> +${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'opengl', '', d)} \
>  "
>
>  PACKAGECONFIG:remove:class-native = "opengl"
>

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#96483): 
https://lists.openembedded.org/g/openembedded-devel/message/96483
Mute This Topic: https://lists.openembedded.org/mt/90338460/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][hardknott][PATCH 2/3] abseil-cpp: Fix build with glibc 2.34

2022-04-08 Thread Armin Kuster



On 4/7/22 17:28, Martin Jansa wrote:
Just like the .patch file in master branch, does hardknott have 
stricter rules than master branch?

master should be fixed then.

Ill take this as-is.

-armin


On Fri, Apr 8, 2022 at 1:57 AM akuster808  wrote:



On 4/5/22 03:41, Martin Jansa wrote:
> From: Khem Raj 
>
> * based on commit from honister, but without the upgrade:
>    commit 8691de2580dd872e3d001d67c8455108b3bd627c
>    Author: Khem Raj 
>    Date:   Sat May 8 14:38:52 2021 -0700
>
>      abseil-cpp: Upgrade to lts_2021_03_24
>
>      Fix build with glibc 2.34 while here
>      Forward patches to this version
>      Let system package the libraries
>
>    to fix abseil-cpp-native build on e.g. Ubuntu-22.04 with
glibc-2.34 to fix:
>
>    | FAILED:

absl/debugging/CMakeFiles/failure_signal_handler.dir/failure_signal_handler.cc.o
>    | /OE/lge/build/webosose/hardknott/BUILD/hosttools/g++
-Dfailure_signal_handler_EXPORTS

-I/OE/lge/build/webosose/hardknott/BUILD/work/x86_64-linux/abseil-cpp-native/20200923+gitAUTOINC+6f9d96a1f4-r0/git

-isystem/OE/lge/build/webosose/hardknott/BUILD/work/x86_64-linux/abseil-cpp-native/20200923+gitAUTOINC+6f9d96a1f4-r0/recipe-sysroot-native/usr/include
-O2 -pipe -fPIC -Wall -Wextra -Wcast-qual -Wconversion-null
-Wmissing-declarations -Woverlength-strings -Wpointer-arith
-Wundef -Wunused-local-typedefs -Wunused-result -Wvarargs -Wvla
-Wwrite-strings -Wno-missing-field-initializers -Wno-sign-compare
-DNOMINMAX -std=gnu++14 -MD -MT

absl/debugging/CMakeFiles/failure_signal_handler.dir/failure_signal_handler.cc.o
-MF

absl/debugging/CMakeFiles/failure_signal_handler.dir/failure_signal_handler.cc.o.d
-o

absl/debugging/CMakeFiles/failure_signal_handler.dir/failure_signal_handler.cc.o
-c

/OE/lge/build/webosose/hardknott/BUILD/work/x86_64-linux/abseil-cpp-native/20200923+gitAUTOINC+6f9d96a1f4-r0/git/absl/debugging/failure_signal_handler.cc
>    |

/OE/lge/build/webosose/hardknott/BUILD/work/x86_64-linux/abseil-cpp-native/20200923+gitAUTOINC+6f9d96a1f4-r0/git/absl/debugging/failure_signal_handler.cc:
In function ‘bool absl::lts_2020_09_23::SetupAlternateStackOnce()’:
>    |

/OE/lge/build/webosose/hardknott/BUILD/work/x86_64-linux/abseil-cpp-native/20200923+gitAUTOINC+6f9d96a1f4-r0/git/absl/debugging/failure_signal_handler.cc:138:32:
error: no matching function for call to ‘max(long int, int)’
>    |   138 |   size_t stack_size = (std::max(SIGSTKSZ, 65536) +
page_mask) & ~page_mask;
>    |       | ^
>
> Signed-off-by: Khem Raj 
> Signed-off-by: Martin Jansa 
> ---
>   ...01-Export-of-internal-Abseil-changes.patch | 82
+++
>   .../abseil-cpp/abseil-cpp_git.bb   
          |  1 +
>   2 files changed, 83 insertions(+)
>   create mode 100644

meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-Export-of-internal-Abseil-changes.patch
>
> diff --git

a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-Export-of-internal-Abseil-changes.patch

b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-Export-of-internal-Abseil-changes.patch
> new file mode 100644
> index 00..c0fb0571f7
> --- /dev/null
> +++

b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-Export-of-internal-Abseil-changes.patch
> @@ -0,0 +1,82 @@
> +From d3424201a73f29ab533121b1821a76e1b4313beb Mon Sep 17
00:00:00 2001
> +From: Abseil Team 
> +Date: Mon, 3 May 2021 07:37:39 -0700
> +Subject: [PATCH] Export of internal Abseil changes
> +
> +--
> +cf88f9cf40eab54c06bca7f20795352ec23bb583 by Derek Mauro
:
> +
> +Fixes build with latest glibc
> +Fixes #952
> +
> +PiperOrigin-RevId: 371693908
> +
> +--
> +99bcd0f4a747ce7a401e23c745adf34d0ec5131b by Samuel Benzaquen
:
> +
> +Add support for std::string_view in StrFormat even when
> +absl::string_view != std::string_view.
> +
> +PiperOrigin-RevId: 371693633
> +
> +--
> +e35463572149a6c2d4a0d439b9300ce03fd6b96d by Abseil Team
:
> +
> +Cmake builds should only install pkg-config when explicitly
requested.
> +
> +PiperOrigin-RevId: 371403419
> +GitOrigin-RevId: cf88f9cf40eab54c06bca7f20795352ec23bb583
> +Change-Id: I4360a18c638a4d901ff44ab1e0a9d8f321c302ea

Patch missing "Upstream-Status" and "Signed-off-by"

- armin
> +---
> + absl/debugging/failure_signal_handler.cc         | 3 ++-
> + absl/strings/internal/str_format/arg.h           | 8 
> + absl/strings/internal/str_format/convert_test.cc | 3 +++
> + 3 files changed, 13 insertions(+), 1 deletion(-)
> +
> +diff --git a/absl/debugging/failure_signal_handler.cc
b/absl/debugging/failure_signal_handler.cc
> +index 5

Re: [oe] [meta-networking][PATCH] drbd-utils: update 9.13.1 -> 9.20.2

2022-04-08 Thread Khem Raj



On 4/8/22 7:58 AM, Sakib Sajal wrote:


On 2022-04-07 15:30, Khem Raj wrote:

[Please note: This e-mail is from an EXTERNAL e-mail address]

fails with clang
https://errors.yoctoproject.org/Errors/Details/654033/

Perhaps we need to pass -Wno-error to silence this warning.

On Wed, Apr 6, 2022 at 12:36 PM Sakib Sajal 
 wrote:

Dropped patch which is merged upstream:
 0001-v84-Make-setup_options-definitions-as-extern.patch

Refreshed patch:
 0001-drbd-utils-support-usrmerge.patch

The compiled binaries are not linked to LDFLAGS options provided
by the build system cause QA issue:
 do_package_qa: QA Issue: File /usr/sbin/drbdmon in package
 drbd-utils doesn't have GNU_HASH (didn't pass LDFLAGS?)
Add LDFLAGS when linking drmdmon binary.

Signed-off-by: Sakib Sajal 
---
  .../0001-drbd-utils-support-usrmerge.patch    | 39 +++
  ...001-drbdmon-add-LDFLAGS-when-linking.patch | 26 +
  ...-setup_options-definitions-as-extern.patch | 32 ---
  ...d-utils_9.13.1.bb => drbd-utils_9.20.2.bb} | 13 +--
  4 files changed, 58 insertions(+), 52 deletions(-)
  create mode 100644 
meta-networking/recipes-support/drbd/drbd-utils/0001-drbdmon-add-LDFLAGS-when-linking.patch 

  delete mode 100644 
meta-networking/recipes-support/drbd/drbd-utils/0001-v84-Make-setup_options-definitions-as-extern.patch 

  rename meta-networking/recipes-support/drbd/{drbd-utils_9.13.1.bb 
=> drbd-utils_9.20.2.bb} (85%)


diff --git 
a/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch 
b/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch 


index 5e128727d..d976680e3 100644
--- 
a/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch 

+++ 
b/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch 


@@ -1,4 +1,4 @@
-From 642b5823abeee27a0fdc2d12d0e1235461ace9ed Mon Sep 17 00:00:00 2001
+From 83764f5d57b3370e0b04a70f814ca49237a66eea Mon Sep 17 00:00:00 2001
  From: Changqing Li 
  Date: Thu, 5 Sep 2019 18:57:39 +0800
  Subject: [PATCH] drbd-utils: support usrmerge
@@ -6,18 +6,19 @@ Subject: [PATCH] drbd-utils: support usrmerge
  Upstream-Status: Inappropriate[oe-specific]

  Signed-off-by: Changqing Li 
+Signed-off-by: Sakib Sajal 
  ---
   configure.ac |  2 +-
- scripts/Makefile.in  |  4 ++--
+ scripts/Makefile.in  | 10 +-
   user/v83/Makefile.in | 14 +++---
   user/v84/Makefile.in | 14 +++---
- 4 files changed, 17 insertions(+), 17 deletions(-)
+ 4 files changed, 20 insertions(+), 20 deletions(-)

  diff --git a/configure.ac b/configure.ac
-index 4df1b4d..c4ef1bc 100644
+index ae575586..3d7deeae 100644
  --- a/configure.ac
  +++ b/configure.ac
-@@ -176,7 +176,7 @@ AC_ARG_WITH(tmpfilesdir,
+@@ -180,7 +180,7 @@ AC_ARG_WITH(tmpfilesdir,
   AC_SUBST(tmpfilesdir)

   # set default early
@@ -27,22 +28,28 @@ index 4df1b4d..c4ef1bc 100644
  test x"$with_udev" = xyes ; then
 if test x"$PKG_CONFIG" != x; then
  diff --git a/scripts/Makefile.in b/scripts/Makefile.in
-index fbb0beb..da701a1 100644
+index fcd298e9..2521fb08 100644
  --- a/scripts/Makefile.in
  +++ b/scripts/Makefile.in
-@@ -75,8 +75,8 @@ endif
- ifeq ($(subst both,systemd,$(initscripttype)),systemd)
+@@ -88,11 +88,11 @@ ifeq ($(subst 
both,systemd,$(initscripttype)),systemd)

 install -d $(DESTDIR)$(systemdunitdir)
 install -m 644 drbd.service $(DESTDIR)$(systemdunitdir)/
--  install -d $(DESTDIR)/lib/drbd/
--  install -m 755 drbd $(DESTDIR)/lib/drbd/
-+  install -d $(DESTDIR)/${nonarch_libdir}/drbd
-+  install -m 755 drbd $(DESTDIR)/${nonarch_libdir}/drbd
+   install -m 644 $(SYSTEMD_TEMPLATES) $(DESTDIR)$(systemdunitdir)/
+-  install -d $(DESTDIR)/lib/drbd/scripts
+-  install -m 755 drbd $(DESTDIR)/lib/drbd/scripts
+-  install -m 755 drbd-service-shim.sh $(DESTDIR)/lib/drbd/scripts
+-  install -m 755 drbd-wait-promotable.sh 
$(DESTDIR)/lib/drbd/scripts

+-  install -m 755 ocf.ra.wrapper.sh $(DESTDIR)/lib/drbd/scripts
++  install -d $(DESTDIR)/${nonarch_libdir}/drbdscripts
++  install -m 755 drbd $(DESTDIR)/${nonarch_libdir}/drbdscripts
++  install -m 755 drbd-service-shim.sh 
$(DESTDIR)/${nonarch_libdir}/drbdscripts
++  install -m 755 drbd-wait-promotable.sh 
$(DESTDIR)/${nonarch_libdir}/drbdscripts
++  install -m 755 ocf.ra.wrapper.sh 
$(DESTDIR)/${nonarch_libdir}/drbdscripts

 install -d $(DESTDIR)$(tmpfilesdir)/
 install -m 444 drbd.tmpfiles.conf 
$(DESTDIR)$(tmpfilesdir)/drbd.conf

   endif
  diff --git a/user/v83/Makefile.in b/user/v83/Makefile.in
-index 27516de..b301376 100644
+index 08cfe574..4c4971b6 100644
  --- a/user/v83/Makefile.in
  +++ b/user/v83/Makefile.in
  @@ -96,19 +96,19 @@ install:
@@ -73,10 +80,10 @@ index 27516de..b301376 100644
   .PHONY: install uninstall clean distclean
   ../../configure:
  diff --git a/user/v84/Makefil

Re: [oe] honister merge request : April 7th

2022-04-08 Thread Khem Raj

merged thanks

On 4/7/22 4:45 PM, akuster808 wrote:
The following changes since commit 
de18681d7dd27000c132bc68f9fa267e8f5a2348:


   python3-django: upgrade 3.2.10 -> 3.2.12 (2022-03-31 13:49:34 -0700)

are available in the Git repository at:

   https://git.openembedded.org/meta-openembedded honister-next

for you to fetch changes up to a19d1802b15fe07e9b1e7584ff9af7c33bfe642a:

   net-snmp: Avoid running `make clean` as it may fail (2022-04-07 
16:42:55 -0700)



Martin Jansa (1):
   htop: switch branch from master to main

Peter Kjellerstedt (2):
   libsrtp: Switch branch from master to main
   net-snmp: Avoid running `make clean` as it may fail

Thomas Perrot (1):
   breakpad: fix branch for gtest in SRC_URI

Trevor Gamblin (1):
   python3-lxml: upgrade 4.6.3 -> 4.6.5

  meta-multimedia/recipes-support/libsrtp/libsrtp_2.3.0.bb | 2 +-
  meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.1.bb | 1 +
  meta-oe/recipes-devtools/breakpad/breakpad_git.bb | 2 +-
  meta-oe/recipes-support/htop/htop_3.0.5.bb | 2 +-
  meta-python/recipes-devtools/python/{python3-lxml_4.6.3.bb => 
python3-lxml_4.6.5.bb} | 2 +-

  5 files changed, 5 insertions(+), 4 deletions(-)
  rename meta-python/recipes-devtools/python/{python3-lxml_4.6.3.bb => 
python3-lxml_4.6.5.bb} (95%)

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#96480): 
https://lists.openembedded.org/g/openembedded-devel/message/96480
Mute This Topic: https://lists.openembedded.org/mt/90325887/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



[oe] [PATCH] wxwidgets: Fix building without x11

2022-04-08 Thread Scott Murray
Building with wayland and opengl in DISTRO_FEATURES without x11 as
well was giving the error:

wxwidgets: PACKAGECONFIG[no_gui] Conflict package config 'opengl' set in 
PACKAGECONFIG.

Upon some investigation, it looks like wxwidgets now supports building
against Gtk's Wayland support, so we can also enable it if wayland is
in DISTRO_FEATURES.  For OpenGL, however, wxwidgets seems to have a
dependency on libglu, so the DISTRO_FEATURES check has been changed
to only enable it by default if both x11 and opengl are configured.

Signed-off-by: Scott Murray 
---
 meta-oe/recipes-extended/wxwidgets/wxwidgets_3.1.5.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 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..e7e89d64a 100644
--- a/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.1.5.bb
+++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.1.5.bb
@@ -43,9 +43,9 @@ EXTRA_OECMAKE:append:libc-musl = " \
 -DHAVE_LOCALE_T=OFF \
 "
 
-# 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)} \
+# OpenGL support currently seems tied to using libglu, which requires x11
+PACKAGECONFIG ?= "${@bb.utils.contains_any('DISTRO_FEATURES', 'x11 wayland', 
'gtk', 'no_gui', d)} \
+${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'opengl', '', d)} \
 "
 
 PACKAGECONFIG:remove:class-native = "opengl"
-- 
2.35.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#96479): 
https://lists.openembedded.org/g/openembedded-devel/message/96479
Mute This Topic: https://lists.openembedded.org/mt/90338460/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-networking][PATCH] drbd-utils: update 9.13.1 -> 9.20.2

2022-04-08 Thread Sakib Sajal


On 2022-04-07 15:30, Khem Raj wrote:

[Please note: This e-mail is from an EXTERNAL e-mail address]

fails with clang
https://errors.yoctoproject.org/Errors/Details/654033/

Perhaps we need to pass -Wno-error to silence this warning.

On Wed, Apr 6, 2022 at 12:36 PM Sakib Sajal  wrote:

Dropped patch which is merged upstream:
 0001-v84-Make-setup_options-definitions-as-extern.patch

Refreshed patch:
 0001-drbd-utils-support-usrmerge.patch

The compiled binaries are not linked to LDFLAGS options provided
by the build system cause QA issue:
 do_package_qa: QA Issue: File /usr/sbin/drbdmon in package
 drbd-utils doesn't have GNU_HASH (didn't pass LDFLAGS?)
Add LDFLAGS when linking drmdmon binary.

Signed-off-by: Sakib Sajal 
---
  .../0001-drbd-utils-support-usrmerge.patch| 39 +++
  ...001-drbdmon-add-LDFLAGS-when-linking.patch | 26 +
  ...-setup_options-definitions-as-extern.patch | 32 ---
  ...d-utils_9.13.1.bb => drbd-utils_9.20.2.bb} | 13 +--
  4 files changed, 58 insertions(+), 52 deletions(-)
  create mode 100644 
meta-networking/recipes-support/drbd/drbd-utils/0001-drbdmon-add-LDFLAGS-when-linking.patch
  delete mode 100644 
meta-networking/recipes-support/drbd/drbd-utils/0001-v84-Make-setup_options-definitions-as-extern.patch
  rename meta-networking/recipes-support/drbd/{drbd-utils_9.13.1.bb => 
drbd-utils_9.20.2.bb} (85%)

diff --git 
a/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch
 
b/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch
index 5e128727d..d976680e3 100644
--- 
a/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch
+++ 
b/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch
@@ -1,4 +1,4 @@
-From 642b5823abeee27a0fdc2d12d0e1235461ace9ed Mon Sep 17 00:00:00 2001
+From 83764f5d57b3370e0b04a70f814ca49237a66eea Mon Sep 17 00:00:00 2001
  From: Changqing Li 
  Date: Thu, 5 Sep 2019 18:57:39 +0800
  Subject: [PATCH] drbd-utils: support usrmerge
@@ -6,18 +6,19 @@ Subject: [PATCH] drbd-utils: support usrmerge
  Upstream-Status: Inappropriate[oe-specific]

  Signed-off-by: Changqing Li 
+Signed-off-by: Sakib Sajal 
  ---
   configure.ac |  2 +-
- scripts/Makefile.in  |  4 ++--
+ scripts/Makefile.in  | 10 +-
   user/v83/Makefile.in | 14 +++---
   user/v84/Makefile.in | 14 +++---
- 4 files changed, 17 insertions(+), 17 deletions(-)
+ 4 files changed, 20 insertions(+), 20 deletions(-)

  diff --git a/configure.ac b/configure.ac
-index 4df1b4d..c4ef1bc 100644
+index ae575586..3d7deeae 100644
  --- a/configure.ac
  +++ b/configure.ac
-@@ -176,7 +176,7 @@ AC_ARG_WITH(tmpfilesdir,
+@@ -180,7 +180,7 @@ AC_ARG_WITH(tmpfilesdir,
   AC_SUBST(tmpfilesdir)

   # set default early
@@ -27,22 +28,28 @@ index 4df1b4d..c4ef1bc 100644
  test x"$with_udev" = xyes ; then
 if test x"$PKG_CONFIG" != x; then
  diff --git a/scripts/Makefile.in b/scripts/Makefile.in
-index fbb0beb..da701a1 100644
+index fcd298e9..2521fb08 100644
  --- a/scripts/Makefile.in
  +++ b/scripts/Makefile.in
-@@ -75,8 +75,8 @@ endif
- ifeq ($(subst both,systemd,$(initscripttype)),systemd)
+@@ -88,11 +88,11 @@ ifeq ($(subst both,systemd,$(initscripttype)),systemd)
 install -d $(DESTDIR)$(systemdunitdir)
 install -m 644 drbd.service $(DESTDIR)$(systemdunitdir)/
--  install -d $(DESTDIR)/lib/drbd/
--  install -m 755 drbd $(DESTDIR)/lib/drbd/
-+  install -d $(DESTDIR)/${nonarch_libdir}/drbd
-+  install -m 755 drbd $(DESTDIR)/${nonarch_libdir}/drbd
+   install -m 644 $(SYSTEMD_TEMPLATES) $(DESTDIR)$(systemdunitdir)/
+-  install -d $(DESTDIR)/lib/drbd/scripts
+-  install -m 755 drbd $(DESTDIR)/lib/drbd/scripts
+-  install -m 755 drbd-service-shim.sh $(DESTDIR)/lib/drbd/scripts
+-  install -m 755 drbd-wait-promotable.sh $(DESTDIR)/lib/drbd/scripts
+-  install -m 755 ocf.ra.wrapper.sh $(DESTDIR)/lib/drbd/scripts
++  install -d $(DESTDIR)/${nonarch_libdir}/drbdscripts
++  install -m 755 drbd $(DESTDIR)/${nonarch_libdir}/drbdscripts
++  install -m 755 drbd-service-shim.sh 
$(DESTDIR)/${nonarch_libdir}/drbdscripts
++  install -m 755 drbd-wait-promotable.sh 
$(DESTDIR)/${nonarch_libdir}/drbdscripts
++  install -m 755 ocf.ra.wrapper.sh 
$(DESTDIR)/${nonarch_libdir}/drbdscripts
 install -d $(DESTDIR)$(tmpfilesdir)/
 install -m 444 drbd.tmpfiles.conf $(DESTDIR)$(tmpfilesdir)/drbd.conf
   endif
  diff --git a/user/v83/Makefile.in b/user/v83/Makefile.in
-index 27516de..b301376 100644
+index 08cfe574..4c4971b6 100644
  --- a/user/v83/Makefile.in
  +++ b/user/v83/Makefile.in
  @@ -96,19 +96,19 @@ install:
@@ -73,10 +80,10 @@ index 27516de..b301376 100644
   .PHONY: install uninstall clean distclean
   ../../configure:
  diff --git a/user/v84/Makefile.in b/user/v84/Makefile.in
-index 38977c6..05ef060 100644
+i

Re: [oe] [meta-oe][PATCH v2 1/2] grpc: add cmake support for target

2022-04-08 Thread Stefan Herbrechtsmeier

Hi Clement,

Am 08.04.2022 um 14:25 schrieb Clément Péron:

Hi Stefan,

On Fri, 8 Apr 2022 at 09:30, Stefan Herbrechtsmeier
 wrote:


From: Stefan Herbrechtsmeier 

The CMake gRPC config checks for binaries and fails if a binary (plugin)
is missing. Fix the problem in the code and add the CMake gRPC config
back to the target package.


Thanks for your patch, I'm still using gRPC 1.35 + your previous similar patch.
I'm trying to bump to gRPC 1.45.1 + these patches.

My recipe use CMake and depends on grpc and grpc-native:
PACKAGECONFIG[grpc] = "-DCONFIG_GRPC=ON,-DCONFIG_GRPC=OFF,grpc grpc-native"

But unfortunately CMake doesn't find the grpc_cpp_plugin.


This is the correct behavior of my patch because the grpc_cpp_plugin 
from the cross build isn't usable during cross build. You need the 
grpc_cpp_plugin from the host and therefore have to search the 
grpc_cpp_plugin by yourself during cross compile [1].


My first patch was rejected and therefore I create a minimal patch which 
only make the CMake gRPC config usable.




| -- Using gRPC 1.45.1

| CMake Error at modules/grpc/CMakeLists.txt:37 (add_custom_command):
|   Error evaluating generator expression:
|
| $
|
|   No target "gRPC::grpc_cpp_plugin"
|
|
| CMake Error at modules/grpc/CMakeLists.txt:37 (add_custom_command):
|   Error evaluating generator expression:
|
| $
|
|   No target "gRPC::grpc_cpp_plugin"
|
|
| CMake Error at modules/grpc/CMakeLists.txt:37 (add_custom_command):
|   Error evaluating generator expression:
|
| $
|
|   No target "gRPC::grpc_cpp_plugin"

Here is my CMake source file:

# Find Protobuf installation Yocto SDK doensn't support protobuf-config.cmake
# for the moment
set(protobuf_MODULE_COMPATIBLE TRUE)
find_package(Protobuf REQUIRED)
message(STATUS "Using protobuf ${Protobuf_VERSION}")
set(_PROTOBUF_LIBPROTOBUF protobuf::libprotobuf)

# Find gRPC installation Looks for gRPCConfig.cmake file installed by gRPC's
# cmake installation.
find_package(gRPC CONFIG REQUIRED)
message(STATUS "Using gRPC ${gRPC_VERSION}")
set(_REFLECTION gRPC::grpc++_reflection)
set(_GRPC_GRPCPP gRPC::grpc++)

# Get full path of protobuf/gRPC compiler
set(_PROTOBUF_PROTOC $)
set(_GRPC_CPP_PLUGIN_EXECUTABLE $)


You have to search the binaries if you cross compile [1]:

if(CMAKE_CROSSCOMPILING)
  find_program(_GRPC_CPP_PLUGIN_EXECUTABLE grpc_cpp_plugin)
else()
  set(_GRPC_CPP_PLUGIN_EXECUTABLE $)
endif()



Do you have an example of how you look for gRPC in your recipe?


This isn't possible because you use a target and not a variable.

[1] https://github.com/grpc/grpc/blob/master/examples/cpp/cmake/common.cmake

Regards
  Stefan

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#96477): 
https://lists.openembedded.org/g/openembedded-devel/message/96477
Mute This Topic: https://lists.openembedded.org/mt/90331029/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 v2 1/2] grpc: add cmake support for target

2022-04-08 Thread Clément Péron
Hi Stefan,

On Fri, 8 Apr 2022 at 09:30, Stefan Herbrechtsmeier
 wrote:
>
> From: Stefan Herbrechtsmeier 
>
> The CMake gRPC config checks for binaries and fails if a binary (plugin)
> is missing. Fix the problem in the code and add the CMake gRPC config
> back to the target package.

Thanks for your patch, I'm still using gRPC 1.35 + your previous similar patch.
I'm trying to bump to gRPC 1.45.1 + these patches.

My recipe use CMake and depends on grpc and grpc-native:
PACKAGECONFIG[grpc] = "-DCONFIG_GRPC=ON,-DCONFIG_GRPC=OFF,grpc grpc-native"

But unfortunately CMake doesn't find the grpc_cpp_plugin.

| -- Using gRPC 1.45.1

| CMake Error at modules/grpc/CMakeLists.txt:37 (add_custom_command):
|   Error evaluating generator expression:
|
| $
|
|   No target "gRPC::grpc_cpp_plugin"
|
|
| CMake Error at modules/grpc/CMakeLists.txt:37 (add_custom_command):
|   Error evaluating generator expression:
|
| $
|
|   No target "gRPC::grpc_cpp_plugin"
|
|
| CMake Error at modules/grpc/CMakeLists.txt:37 (add_custom_command):
|   Error evaluating generator expression:
|
| $
|
|   No target "gRPC::grpc_cpp_plugin"

Here is my CMake source file:

# Find Protobuf installation Yocto SDK doensn't support protobuf-config.cmake
# for the moment
set(protobuf_MODULE_COMPATIBLE TRUE)
find_package(Protobuf REQUIRED)
message(STATUS "Using protobuf ${Protobuf_VERSION}")
set(_PROTOBUF_LIBPROTOBUF protobuf::libprotobuf)

# Find gRPC installation Looks for gRPCConfig.cmake file installed by gRPC's
# cmake installation.
find_package(gRPC CONFIG REQUIRED)
message(STATUS "Using gRPC ${gRPC_VERSION}")
set(_REFLECTION gRPC::grpc++_reflection)
set(_GRPC_GRPCPP gRPC::grpc++)

# Get full path of protobuf/gRPC compiler
set(_PROTOBUF_PROTOC $)
set(_GRPC_CPP_PLUGIN_EXECUTABLE $)

Do you have an example of how you look for gRPC in your recipe?

Thanks for your help
Regards,
Clement

>
> Signed-off-by: Stefan Herbrechtsmeier 
>
> ---
>
> Changes in v2:
> - Rebase on top of latest master
>
>  ...d-separate-export-for-plugin-targets.patch | 93 +++
>  meta-oe/recipes-devtools/grpc/grpc_1.45.1.bb  |  3 +-
>  2 files changed, 94 insertions(+), 2 deletions(-)
>  create mode 100644 
> meta-oe/recipes-devtools/grpc/grpc/0001-cmake-add-separate-export-for-plugin-targets.patch
>
> diff --git 
> a/meta-oe/recipes-devtools/grpc/grpc/0001-cmake-add-separate-export-for-plugin-targets.patch
>  
> b/meta-oe/recipes-devtools/grpc/grpc/0001-cmake-add-separate-export-for-plugin-targets.patch
> new file mode 100644
> index 0..679bd3882
> --- /dev/null
> +++ 
> b/meta-oe/recipes-devtools/grpc/grpc/0001-cmake-add-separate-export-for-plugin-targets.patch
> @@ -0,0 +1,93 @@
> +From 3150cb043363e05588062dd392b940be25594713 Mon Sep 17 00:00:00 2001
> +From: Stefan Herbrechtsmeier 
> +Date: Tue, 18 Feb 2020 14:17:07 +0100
> +Subject: [PATCH] cmake: add separate export for plugin targets
> +
> +Upstream-Status: Submitted [https://github.com/grpc/grpc/pull/29328]
> +
> +
> +---
> + CMakeLists.txt | 18 +++---
> + 1 file changed, 11 insertions(+), 7 deletions(-)
> +
> +diff --git a/CMakeLists.txt b/CMakeLists.txt
> +index efdaf8936d..6608b1b00c 100644
> +--- a/CMakeLists.txt
>  b/CMakeLists.txt
> +@@ -10935,7 +10935,7 @@ target_link_libraries(grpc_cpp_plugin
> +
> +
> + if(gRPC_INSTALL)
> +-  install(TARGETS grpc_cpp_plugin EXPORT gRPCTargets
> ++  install(TARGETS grpc_cpp_plugin EXPORT gRPCPluginTargets
> + RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR}
> + BUNDLE DESTINATION  ${gRPC_INSTALL_BINDIR}
> + LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR}
> +@@ -10975,7 +10975,7 @@ target_link_libraries(grpc_csharp_plugin
> +
> +
> + if(gRPC_INSTALL)
> +-  install(TARGETS grpc_csharp_plugin EXPORT gRPCTargets
> ++  install(TARGETS grpc_csharp_plugin EXPORT gRPCPluginTargets
> + RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR}
> + BUNDLE DESTINATION  ${gRPC_INSTALL_BINDIR}
> + LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR}
> +@@ -11015,7 +11015,7 @@ target_link_libraries(grpc_node_plugin
> +
> +
> + if(gRPC_INSTALL)
> +-  install(TARGETS grpc_node_plugin EXPORT gRPCTargets
> ++  install(TARGETS grpc_node_plugin EXPORT gRPCPluginTargets
> + RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR}
> + BUNDLE DESTINATION  ${gRPC_INSTALL_BINDIR}
> + LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR}
> +@@ -11055,7 +11055,7 @@ target_link_libraries(grpc_objective_c_plugin
> +
> +
> + if(gRPC_INSTALL)
> +-  install(TARGETS grpc_objective_c_plugin EXPORT gRPCTargets
> ++  install(TARGETS grpc_objective_c_plugin EXPORT gRPCPluginTargets
> + RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR}
> + BUNDLE DESTINATION  ${gRPC_INSTALL_BINDIR}
> + LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR}
> +@@ -11095,7 +11095,7 @@ target_link_libraries(grpc_php_plugin
> +
> +
> + if(gRPC_INSTALL)
> +-  install(TARGETS grpc_php_plugin EXPORT gRPCTargets
> ++  install(TARGETS grpc_php_plugin EXPORT gRPCPluginTargets
> + RUNTIME DESTINATION ${gRPC_INSTALL

[oe] [meta-python][dunfell][PATCH] python3-urllib3: Fix CVE-2020-26137 and CVE-2021-33503

2022-04-08 Thread Ranjitsinh Rathod
From: Ranjitsinh Rathod 

Add patch to fix CVE-2020-26137
Link: https://ubuntu.com/security/CVE-2020-26137
Link: 
https://github.com/urllib3/urllib3/commit/1dd69c5c5982fae7c87a620d487c2ebf7a6b436b.patch

Add patch to fix  CVE-2021-33503
Link: https://ubuntu.com/security/CVE-2021-33503
Link: 
https://github.com/urllib3/urllib3/commit/2d4a3fee6de2fa45eb82169361918f759269b4ec.patch

Signed-off-by: Nikhil R 
Signed-off-by: Ranjitsinh Rathod 
Signed-off-by: Ranjitsinh Rathod 
---
 .../python3-urllib3/CVE-2020-26137.patch  | 72 +++
 .../python3-urllib3/CVE-2021-33503.patch  | 67 +
 .../python/python3-urllib3_1.25.7.bb  |  6 +-
 3 files changed, 143 insertions(+), 2 deletions(-)
 create mode 100644 
meta-python/recipes-devtools/python/python3-urllib3/CVE-2020-26137.patch
 create mode 100644 
meta-python/recipes-devtools/python/python3-urllib3/CVE-2021-33503.patch

diff --git 
a/meta-python/recipes-devtools/python/python3-urllib3/CVE-2020-26137.patch 
b/meta-python/recipes-devtools/python/python3-urllib3/CVE-2020-26137.patch
new file mode 100644
index 0..3cc8bcd02
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-urllib3/CVE-2020-26137.patch
@@ -0,0 +1,72 @@
+From 1dd69c5c5982fae7c87a620d487c2ebf7a6b436b Mon Sep 17 00:00:00 2001
+From: Seth Michael Larson 
+Date: Mon, 17 Feb 2020 15:34:48 -0600
+Subject: [PATCH] Raise ValueError if method contains control characters
+ (#1800)
+
+CVE: CVE-2020-26137
+Upstream-Status: Backport 
[https://github.com/urllib3/urllib3/commit/1dd69c5c5982fae7c87a620d487c2ebf7a6b436b.patch]
+Signed-off-by: Nikhil R 
+Signed-off-by: Ranjitsinh Rathod 
+Comment: Removed one hunk in CHANGES.rst and refresh other to remove
+patch fuzz warnings
+
+---
+ src/urllib3/connection.py| 14 ++
+ test/with_dummyserver/test_connectionpool.py |  6 ++
+ 2 files changed, 20 insertions(+)
+
+diff --git a/src/urllib3/connection.py b/src/urllib3/connection.py
+index 71e6790b1b..f7b1760938 100644
+--- a/src/urllib3/connection.py
 b/src/urllib3/connection.py
+@@ -1,4 +1,5 @@
+ from __future__ import absolute_import
++import re
+ import datetime
+ import logging
+ import os
+@@ -58,6 +59,8 @@ port_by_scheme = {"http": 80, "https": 443}
+ # (ie test_recent_date is failing) update it to ~6 months before the current 
date.
+ RECENT_DATE = datetime.date(2019, 1, 1)
+ 
++_CONTAINS_CONTROL_CHAR_RE = re.compile(r"[^-!#$%&'*+.^_`|~0-9a-zA-Z]")
++
+ 
+ class DummyConnection(object):
+ """Used to detect a failed ConnectionCls import."""
+@@ -184,6 +187,17 @@ class HTTPConnection(_HTTPConnection, object):
+ conn = self._new_conn()
+ self._prepare_conn(conn)
+ 
++def putrequest(self, method, url, *args, **kwargs):
++"""Send a request to the server"""
++match = _CONTAINS_CONTROL_CHAR_RE.search(method)
++if match:
++raise ValueError(
++"Method cannot contain non-token characters %r (found at 
least %r)"
++% (method, match.group())
++)
++
++return _HTTPConnection.putrequest(self, method, url, *args, **kwargs)
++
+ def request_chunked(self, method, url, body=None, headers=None):
+ """
+ Alternative to the common request method, which sends the
+diff --git a/test/with_dummyserver/test_connectionpool.py 
b/test/with_dummyserver/test_connectionpool.py
+index 57f0dbd2f4..79cbd27185 100644
+--- a/test/with_dummyserver/test_connectionpool.py
 b/test/with_dummyserver/test_connectionpool.py
+@@ -677,6 +677,12 @@ class TestConnectionPool(HTTPDummyServerTestCase):
+ with pytest.raises(MaxRetryError):
+ pool.request("GET", "/test", retries=2)
+ 
++@pytest.mark.parametrize("char", [" ", "\r", "\n", "\x00"])
++def test_invalid_method_not_allowed(self, char):
++with pytest.raises(ValueError):
++with HTTPConnectionPool(self.host, self.port) as pool:
++pool.request("GET" + char, "/")
++
+ def test_percent_encode_invalid_target_chars(self):
+ with HTTPConnectionPool(self.host, self.port) as pool:
+ r = pool.request("GET", "/echo_params?q=\r&k=\n \n")
diff --git 
a/meta-python/recipes-devtools/python/python3-urllib3/CVE-2021-33503.patch 
b/meta-python/recipes-devtools/python/python3-urllib3/CVE-2021-33503.patch
new file mode 100644
index 0..838add955
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-urllib3/CVE-2021-33503.patch
@@ -0,0 +1,67 @@
+From 2d4a3fee6de2fa45eb82169361918f759269b4ec Mon Sep 17 00:00:00 2001
+From: Seth Michael Larson 
+Date: Wed, 26 May 2021 10:43:12 -0500
+Subject: [PATCH] Improve performance of sub-authority splitting in URL
+
+CVE: CVE-2021-33503
+Upstream-Status: Backport 
[https://github.com/urllib3/urllib3/commit/2d4a3fee6de2fa45eb82169361918f759269b4ec.patch]
+Signed-off-by: Nikhil R 
+Signed-off-by: Ranjitsinh Rathod 
+Comment: Refresh hunks to remove patch

[oe] [meta-gnome][PATCHv3] gparted: update to v1.4.0

2022-04-08 Thread Markus Volk
- remove x11 features-check because there aren't dependencies that would
  explicilty require x11 as a DISTRO_FEATURE
- replace basename() by g_path_get_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-replace-gnu-basename.patch | 50 +++
 .../{gparted_1.3.1.bb => gparted_1.4.0.bb}|  6 +--
 2 files changed, 53 insertions(+), 3 deletions(-)
 create mode 100644 
meta-gnome/recipes-extended/gparted/files/0001-replace-gnu-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-replace-gnu-basename.patch 
b/meta-gnome/recipes-extended/gparted/files/0001-replace-gnu-basename.patch
new file mode 100644
index 0..48e06b6c5
--- /dev/null
+++ b/meta-gnome/recipes-extended/gparted/files/0001-replace-gnu-basename.patch
@@ -0,0 +1,50 @@
+From 3ed0d96c0d6d4fd8a12742232d841ed5e77bfe11 Mon Sep 17 00:00:00 2001
+From: Markus Volk 
+Date: Fri, 8 Apr 2022 09:31:32 +0200
+Subject: [PATCH] BCache_Info.cc: replace basename by glibs g_path_get_basename
+
+'basename' is undeclared for cplusplus if using musl. Use g_path_get_basename
+instead for better portability.
+
+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
+---
+ src/BCache_Info.cc | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/src/BCache_Info.cc b/src/BCache_Info.cc
+index 129a5178..e1ec51b2 100644
+--- a/src/BCache_Info.cc
 b/src/BCache_Info.cc
+@@ -17,7 +17,6 @@
+ 
+ #include "BCache_Info.h"
+ 
+-#include   // GNU version of basename()
+ #include 
+ #include 
+ #include 
+@@ -49,7 +48,7 @@ Glib::ustring BCache_Info::get_bcache_device(const 
Glib::ustring& device_path, c
+   return Glib::ustring("");
+   buf[len] = '\0';
+ 
+-  return "/dev/" + Glib::ustring(basename(buf));
++  return "/dev/" + Glib::ustring(g_path_get_basename(buf));
+ }
+ 
+ 
+-- 
+2.25.1
+
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..a4b653ceb 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 = "f

[oe] [meta-oe][PATCH v2 1/2] grpc: add cmake support for target

2022-04-08 Thread Stefan Herbrechtsmeier
From: Stefan Herbrechtsmeier 

The CMake gRPC config checks for binaries and fails if a binary (plugin)
is missing. Fix the problem in the code and add the CMake gRPC config
back to the target package.

Signed-off-by: Stefan Herbrechtsmeier 

---

Changes in v2:
- Rebase on top of latest master

 ...d-separate-export-for-plugin-targets.patch | 93 +++
 meta-oe/recipes-devtools/grpc/grpc_1.45.1.bb  |  3 +-
 2 files changed, 94 insertions(+), 2 deletions(-)
 create mode 100644 
meta-oe/recipes-devtools/grpc/grpc/0001-cmake-add-separate-export-for-plugin-targets.patch

diff --git 
a/meta-oe/recipes-devtools/grpc/grpc/0001-cmake-add-separate-export-for-plugin-targets.patch
 
b/meta-oe/recipes-devtools/grpc/grpc/0001-cmake-add-separate-export-for-plugin-targets.patch
new file mode 100644
index 0..679bd3882
--- /dev/null
+++ 
b/meta-oe/recipes-devtools/grpc/grpc/0001-cmake-add-separate-export-for-plugin-targets.patch
@@ -0,0 +1,93 @@
+From 3150cb043363e05588062dd392b940be25594713 Mon Sep 17 00:00:00 2001
+From: Stefan Herbrechtsmeier 
+Date: Tue, 18 Feb 2020 14:17:07 +0100
+Subject: [PATCH] cmake: add separate export for plugin targets
+
+Upstream-Status: Submitted [https://github.com/grpc/grpc/pull/29328]
+
+
+---
+ CMakeLists.txt | 18 +++---
+ 1 file changed, 11 insertions(+), 7 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index efdaf8936d..6608b1b00c 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -10935,7 +10935,7 @@ target_link_libraries(grpc_cpp_plugin
+ 
+ 
+ if(gRPC_INSTALL)
+-  install(TARGETS grpc_cpp_plugin EXPORT gRPCTargets
++  install(TARGETS grpc_cpp_plugin EXPORT gRPCPluginTargets
+ RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR}
+ BUNDLE DESTINATION  ${gRPC_INSTALL_BINDIR}
+ LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR}
+@@ -10975,7 +10975,7 @@ target_link_libraries(grpc_csharp_plugin
+ 
+ 
+ if(gRPC_INSTALL)
+-  install(TARGETS grpc_csharp_plugin EXPORT gRPCTargets
++  install(TARGETS grpc_csharp_plugin EXPORT gRPCPluginTargets
+ RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR}
+ BUNDLE DESTINATION  ${gRPC_INSTALL_BINDIR}
+ LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR}
+@@ -11015,7 +11015,7 @@ target_link_libraries(grpc_node_plugin
+ 
+ 
+ if(gRPC_INSTALL)
+-  install(TARGETS grpc_node_plugin EXPORT gRPCTargets
++  install(TARGETS grpc_node_plugin EXPORT gRPCPluginTargets
+ RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR}
+ BUNDLE DESTINATION  ${gRPC_INSTALL_BINDIR}
+ LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR}
+@@ -11055,7 +11055,7 @@ target_link_libraries(grpc_objective_c_plugin
+ 
+ 
+ if(gRPC_INSTALL)
+-  install(TARGETS grpc_objective_c_plugin EXPORT gRPCTargets
++  install(TARGETS grpc_objective_c_plugin EXPORT gRPCPluginTargets
+ RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR}
+ BUNDLE DESTINATION  ${gRPC_INSTALL_BINDIR}
+ LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR}
+@@ -11095,7 +11095,7 @@ target_link_libraries(grpc_php_plugin
+ 
+ 
+ if(gRPC_INSTALL)
+-  install(TARGETS grpc_php_plugin EXPORT gRPCTargets
++  install(TARGETS grpc_php_plugin EXPORT gRPCPluginTargets
+ RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR}
+ BUNDLE DESTINATION  ${gRPC_INSTALL_BINDIR}
+ LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR}
+@@ -11135,7 +11135,7 @@ target_link_libraries(grpc_python_plugin
+ 
+ 
+ if(gRPC_INSTALL)
+-  install(TARGETS grpc_python_plugin EXPORT gRPCTargets
++  install(TARGETS grpc_python_plugin EXPORT gRPCPluginTargets
+ RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR}
+ BUNDLE DESTINATION  ${gRPC_INSTALL_BINDIR}
+ LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR}
+@@ -11175,7 +11175,7 @@ target_link_libraries(grpc_ruby_plugin
+ 
+ 
+ if(gRPC_INSTALL)
+-  install(TARGETS grpc_ruby_plugin EXPORT gRPCTargets
++  install(TARGETS grpc_ruby_plugin EXPORT gRPCPluginTargets
+ RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR}
+ BUNDLE DESTINATION  ${gRPC_INSTALL_BINDIR}
+ LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR}
+@@ -17349,6 +17349,10 @@ if(gRPC_INSTALL)
+ DESTINATION ${gRPC_INSTALL_CMAKEDIR}
+ NAMESPACE gRPC::
+   )
++  install(EXPORT gRPCPluginTargets
++DESTINATION ${gRPC_INSTALL_CMAKEDIR}
++NAMESPACE gRPC::
++  )
+ endif()
+ 
+ include(CMakePackageConfigHelpers)
+-- 
+2.30.2
+
diff --git a/meta-oe/recipes-devtools/grpc/grpc_1.45.1.bb 
b/meta-oe/recipes-devtools/grpc/grpc_1.45.1.bb
index 872bc6afc..292ea7f9b 100644
--- a/meta-oe/recipes-devtools/grpc/grpc_1.45.1.bb
+++ b/meta-oe/recipes-devtools/grpc/grpc_1.45.1.bb
@@ -24,6 +24,7 @@ SRCREV_grpc = "1c159689ceda2c408f7f9d97d96a264c9521b806"
 BRANCH = "v1.45.x"
 SRC_URI = 
"git://github.com/grpc/grpc.git;protocol=https;name=grpc;branch=${BRANCH} \

file://0001-Revert-Changed-GRPCPP_ABSEIL_SYNC-to-GPR_ABSEIL_SYNC.patch \
+   file://0001-cmake-add-separate-export-for-plugin-targets.patch \
"
 # Fixes build with older compilers 4.8 especially on ubuntu 14.04
 CXXFLAGS:append:class-native = " -Wl,--no-as-needed"
@@ -80,8 

[oe] [meta-oe][PATCH v2 2/2] grpc: remove useless link with libatomic append

2022-04-08 Thread Stefan Herbrechtsmeier
From: Stefan Herbrechtsmeier 

The sed commands to link with libatomic don't match and is therefore
useless. If they are really needed the problem should be fixed in the
code for example with CHECK_LIBRARY_EXISTS.

Signed-off-by: Stefan Herbrechtsmeier 

---

(no changes since v1)

 meta-oe/recipes-devtools/grpc/grpc_1.45.1.bb | 20 
 1 file changed, 20 deletions(-)

diff --git a/meta-oe/recipes-devtools/grpc/grpc_1.45.1.bb 
b/meta-oe/recipes-devtools/grpc/grpc_1.45.1.bb
index 292ea7f9b..7275f451a 100644
--- a/meta-oe/recipes-devtools/grpc/grpc_1.45.1.bb
+++ b/meta-oe/recipes-devtools/grpc/grpc_1.45.1.bb
@@ -59,26 +59,6 @@ do_configure:prepend() {
 sed -i -e "s#lib/pkgconfig/#${baselib}/pkgconfig/#g" ${S}/CMakeLists.txt
 }
 
-do_configure:prepend:mipsarch() {
-sed -i -e "s/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} rt m 
pthread)/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} atomic rt m 
pthread)/g" ${S}/CMakeLists.txt
-}
-
-do_configure:prepend:powerpc() {
-sed -i -e "s/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} rt m 
pthread)/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} atomic rt m 
pthread)/g" ${S}/CMakeLists.txt
-}
-
-do_configure:prepend:riscv64() {
-sed -i -e "s/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} rt m 
pthread)/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} atomic rt m 
pthread)/g" ${S}/CMakeLists.txt
-}
-
-do_configure:prepend:riscv32() {
-sed -i -e "s/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} rt m 
pthread)/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} atomic rt m 
pthread)/g" ${S}/CMakeLists.txt
-}
-
-do_configure:prepend:toolchain-clang:x86() {
-sed -i -e "s/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} rt m 
pthread)/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} atomic rt m 
pthread)/g" ${S}/CMakeLists.txt
-}
-
 BBCLASSEXTEND = "native nativesdk"
 
 FILES:${PN}-compiler += " \
-- 
2.30.2


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#96472): 
https://lists.openembedded.org/g/openembedded-devel/message/96472
Mute This Topic: https://lists.openembedded.org/mt/90331028/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-