Skip to contentSkip to conversation

glibc-testsuite: SkipRecipe if libc is not glibc

PATCH In review Nathan Rossi 3 participants 3 messages Sep 13, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 glibc-testsuite: SkipRecipe if libc is not glibc

To prevent issues with parsing or dependencies, limit this recipe to use only when the libc is glibc (and libc-locale is glibc-locale).

---
 meta/recipes-core/glibc/glibc-testsuite_2.30.bb | 7 +++++++
 1 file changed, 7 insertions(+)
meta/recipes-core/glibc/glibc-testsuite_2.30.bb +7 -0
index 64fa8d87df..657fd4dbc1 100644
@@ -8,6 +8,13 @@ PROVIDES = ""
 # setup depends
 INHIBIT_DEFAULT_DEPS = ""
 
+python () {
+    libc = d.getVar("PREFERRED_PROVIDER_virtual/libc")
+    libclocale = d.getVar("PREFERRED_PROVIDER_virtual/libc-locale")
+    if libc != "glibc" or libclocale != "glibc-locale":
+        raise bb.parse.SkipRecipe("glibc-testsuite requires that virtual/libc is glibc")
+}
+
 DEPENDS += "glibc-locale libgcc gcc-runtime"
 
 # remove the initial depends

---
2.23.0

#1 lore raw
Quoted 14 lines · Nathan Rossi

To prevent issues with parsing or dependencies, limit this recipe to use only when the libc is glibc (and libc-locale is glibc-locale).

---
 meta/recipes-core/glibc/glibc-testsuite_2.30.bb | 7 +++++++
 1 file changed, 7 insertions(+)
meta/recipes-core/glibc/glibc-testsuite_2.30.bb +0 -0
index 64fa8d87df..657fd4dbc1 100644

meta/recipes-core/glibc/glibc-testsuite_2.30.bb PROVIDES = "" · line 17

Quoted 10 lines
meta/recipes-core/glibc/glibc-testsuite_2.30.bb +7 -0
@@ -8,6 +8,13 @@ PROVIDES = ""
 # setup depends
 INHIBIT_DEFAULT_DEPS = ""
 
+python () {
+    libc = d.getVar("PREFERRED_PROVIDER_virtual/libc")
+    libclocale = d.getVar("PREFERRED_PROVIDER_virtual/libc-locale")
+    if libc != "glibc" or libclocale != "glibc-locale":
+        raise bb.parse.SkipRecipe("glibc-testsuite requires that virtual/libc is glibc")
+}
+

would something like below work

COMPATIBLE_HOST ?= "null"
COMAPTIBLE_HOST_libc-glibc = "(*)"

Quoted 10 lines
meta/recipes-core/glibc/glibc-testsuite_2.30.bb +0 -1
 DEPENDS += "glibc-locale libgcc gcc-runtime"
 
 # remove the initial depends
---

2.23.0
--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

#2 lore raw
Quoted 40 lines

-----Original Message-----
From: Khem Raj <[email protected]>
Sent: den 13 september 2019 15:48
To: Nathan Rossi <[email protected]>
Cc: Patches and discussions about the oe-core layer <openembedded- [email protected]>; Peter Kjellerstedt <[email protected]>
Subject: Re: [OE-core] [PATCH] glibc-testsuite: SkipRecipe if libc is not glibc

Quoted 2 lines · Nathan Rossi

To prevent issues with parsing or dependencies, limit this recipe to

use

Review

Quoted 8 lines

only when the libc is glibc (and libc-locale is glibc-locale).

---
 meta/recipes-core/glibc/glibc-testsuite_2.30.bb | 7 +++++++
 1 file changed, 7 insertions(+)
(quoted diff) +0 -0

b/meta/recipes-core/glibc/glibc-testsuite_2.30.bb

Quoted 4 lines

index 64fa8d87df..657fd4dbc1 100644

meta/recipes-core/glibc/glibc-testsuite_2.30.bb PROVIDES = "" · line 17

Quoted 10 lines
meta/recipes-core/glibc/glibc-testsuite_2.30.bb +7 -0
@@ -8,6 +8,13 @@ PROVIDES = ""
 # setup depends
 INHIBIT_DEFAULT_DEPS = ""
 
+python () {
+    libc = d.getVar("PREFERRED_PROVIDER_virtual/libc")
+    libclocale = d.getVar("PREFERRED_PROVIDER_virtual/libc-locale")
+    if libc != "glibc" or libclocale != "glibc-locale":
+        raise bb.parse.SkipRecipe("glibc-testsuite requires that virtual/libc is glibc")
+}
+

would something like below work

Quoted 2 lines

COMPATIBLE_HOST ?= "null" COMAPTIBLE_HOST_libc-glibc = "(*)"

No, that will not work. The glibc we use is still glibc, even if it is not the version from OE-Core. Thus the libc-glibc override is active also in our case.

Quoted 5 lines
Quoted 5 lines
meta/recipes-core/glibc/glibc-testsuite_2.30.bb +0 -1
 DEPENDS += "glibc-locale libgcc gcc-runtime"
 
 # remove the initial depends
---

2.23.0

I'll be back when I have had time to test the suggested patch.

//Peter