diff mbox series

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

Message ID 20220408194242.1224639-1-jpuhlman@mvista.com
State New
Headers show
Series [meta-oe] ndctl: Remove run test of typeof | expand

Commit Message

Jeremy Puhlman April 8, 2022, 7:42 p.m. UTC 
../git/meson.build:213:0: ERROR: Can not run test applications in this cross environment.

Signed-off-by: Jeremy A. Puhlman <jpuhlman@mvista.com>
---
 ...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

Comments

Khem Raj April 8, 2022, 7:54 p.m. UTC | #1 
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 <jpuhlman@mvista.com>
> ---
>   ...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 000000000..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" <jpuhlman@mvista.com>
> +Date: Fri, 8 Apr 2022 19:31:02 +0000
> +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 <jpuhlman@mvista.com>
> +---
> + 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 = "(?P<pver>v\d+(\.\d+)*)"
>   
> 
> 
> 
> -=-=-=-=-=-=-=-=-=-=-=-
> 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/1997914
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Jeremy Puhlman April 9, 2022, 2:31 a.m. UTC | #2 
Yeah I saw that later in the day, it addresses the same issue.

On Fri, Apr 8, 2022, 12:54 PM Khem Raj <raj.khem@gmail.com> 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 <jpuhlman@mvista.com>
> > ---
> >   ...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 000000000..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" <jpuhlman@mvista.com>
> > +Date: Fri, 8 Apr 2022 19:31:02 +0000
> > +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 <jpuhlman@mvista.com>
> > +---
> > + 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 = "(?P<pver>v\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/2167262
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [
> jpuhlman@mvista.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>
Khem Raj April 9, 2022, 2:49 a.m. UTC | #3 
Cool, thanks!

On Fri, Apr 8, 2022 at 7:31 PM Jeremy Puhlman <jpuhlman@mvista.com> wrote:

> Yeah I saw that later in the day, it addresses the same issue.
>
> On Fri, Apr 8, 2022, 12:54 PM Khem Raj <raj.khem@gmail.com> 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 <jpuhlman@mvista.com>
>> > ---
>> >   ...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 000000000..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" <jpuhlman@mvista.com>
>> > +Date: Fri, 8 Apr 2022 19:31:02 +0000
>> > +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 <jpuhlman@mvista.com>
>> > +---
>> > + 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 = "(?P<pver>v\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/2167262
>> Group Owner: openembedded-devel+owner@lists.openembedded.org
>> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [
>> jpuhlman@mvista.com]
>> -=-=-=-=-=-=-=-=-=-=-=-
>>
>>
diff mbox series

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 000000000..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" <jpuhlman@mvista.com>
+Date: Fri, 8 Apr 2022 19:31:02 +0000
+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 <jpuhlman@mvista.com>
+---
+ 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 = "(?P<pver>v\d+(\.\d+)*)"