diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-06-13 09:31:52 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-07-01 13:58:08 +0100 |
| commit | 3c1c56ec07d6f507077458faf5818ff4a88dce98 (patch) | |
| tree | e6a795917e7fcbb7f57deb3878583470cf55fc26 /meta/recipes-kernel | |
| parent | 45aeae0075ead6f6509048857c4de213a7a302a8 (diff) | |
| download | poky-3c1c56ec07d6f507077458faf5818ff4a88dce98.tar.gz | |
native/nativesdk: Stop overriding unprefixed *FLAGS variables
We're currently encouraging an "arms race" with the FLAGS variables since
a recipe might want to set a specific flag for all variants but to do so,
+= won't work due to the assignment in the native/nativesdk class files. This
means recipes are using append.
Since the default variables are constructed out of TARGET_XXX variables and
we redefine these, there is no need to re-define the un-prefixed variables. If
we drop that, the += appends and similar work and recipes don't have to resort
to append.
Change the classes and cleanup a number of recipes to adapt to the change. This
change will result in some flags appearing to some native/nativesdk variants
but that is probably what was originally expected anyway.
(From OE-Core rev: a157b2f9d93428ca21265cc860a3b58b3698b3aa)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
| -rw-r--r-- | meta/recipes-kernel/lttng/babeltrace2_2.0.6.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-kernel/powertop/powertop_2.15.bb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-kernel/lttng/babeltrace2_2.0.6.bb b/meta/recipes-kernel/lttng/babeltrace2_2.0.6.bb index d6c75d7580..a50ba8fcdf 100644 --- a/meta/recipes-kernel/lttng/babeltrace2_2.0.6.bb +++ b/meta/recipes-kernel/lttng/babeltrace2_2.0.6.bb | |||
| @@ -28,7 +28,7 @@ FILES:${PN}-staticdev += "${libdir}/babeltrace2/plugins/*.a" | |||
| 28 | FILES:${PN} += "${libdir}/babeltrace2/plugins/*.so" | 28 | FILES:${PN} += "${libdir}/babeltrace2/plugins/*.so" |
| 29 | 29 | ||
| 30 | ASNEEDED = "" | 30 | ASNEEDED = "" |
| 31 | LDFLAGS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld ptest', ' -fuse-ld=bfd ', '', d)}" | 31 | LDFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld ptest', '-fuse-ld=bfd ', '', d)}" |
| 32 | 32 | ||
| 33 | # coreutils since we need full mktemp | 33 | # coreutils since we need full mktemp |
| 34 | RDEPENDS:${PN}-ptest += "bash gawk python3 make grep coreutils findutils" | 34 | RDEPENDS:${PN}-ptest += "bash gawk python3 make grep coreutils findutils" |
diff --git a/meta/recipes-kernel/powertop/powertop_2.15.bb b/meta/recipes-kernel/powertop/powertop_2.15.bb index 65c6d0fcd3..ec81d546a8 100644 --- a/meta/recipes-kernel/powertop/powertop_2.15.bb +++ b/meta/recipes-kernel/powertop/powertop_2.15.bb | |||
| @@ -13,7 +13,7 @@ SRCREV = "d51ad395436d4d1dcc3ca46e1519ffeb475bf651" | |||
| 13 | 13 | ||
| 14 | S = "${WORKDIR}/git" | 14 | S = "${WORKDIR}/git" |
| 15 | 15 | ||
| 16 | LDFLAGS:append = " -pthread" | 16 | LDFLAGS += "-pthread" |
| 17 | 17 | ||
| 18 | inherit autotools gettext pkgconfig bash-completion | 18 | inherit autotools gettext pkgconfig bash-completion |
| 19 | 19 | ||
