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-support | |
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-support')
-rw-r--r-- | meta/recipes-support/sqlite/sqlite3.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-support/sqlite/sqlite3.inc b/meta/recipes-support/sqlite/sqlite3.inc index 9a0de08553..d093ec5859 100644 --- a/meta/recipes-support/sqlite/sqlite3.inc +++ b/meta/recipes-support/sqlite/sqlite3.inc | |||
@@ -45,14 +45,14 @@ EXTRA_OECONF = " \ | |||
45 | " | 45 | " |
46 | 46 | ||
47 | # pread() is in POSIX.1-2001 so any reasonable system must surely support it | 47 | # pread() is in POSIX.1-2001 so any reasonable system must surely support it |
48 | CFLAGS:append = " -DUSE_PREAD" | 48 | CFLAGS += "-DUSE_PREAD" |
49 | 49 | ||
50 | # Provide column meta-data API | 50 | # Provide column meta-data API |
51 | CFLAGS:append = " -DSQLITE_ENABLE_COLUMN_METADATA" | 51 | CFLAGS += "-DSQLITE_ENABLE_COLUMN_METADATA" |
52 | 52 | ||
53 | # Unless SQLITE_BYTEORDER is predefined, the code falls back to build time | 53 | # Unless SQLITE_BYTEORDER is predefined, the code falls back to build time |
54 | # huristics, which are not always correct | 54 | # huristics, which are not always correct |
55 | CFLAGS:append = " ${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'le', '-DSQLITE_BYTEORDER=1234', '-DSQLITE_BYTEORDER=4321', d)}" | 55 | CFLAGS += "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'le', '-DSQLITE_BYTEORDER=1234', '-DSQLITE_BYTEORDER=4321', d)}" |
56 | 56 | ||
57 | PACKAGES = "lib${BPN} lib${BPN}-dev lib${BPN}-doc ${PN}-dbg lib${BPN}-staticdev ${PN}" | 57 | PACKAGES = "lib${BPN} lib${BPN}-dev lib${BPN}-doc ${PN}-dbg lib${BPN}-staticdev ${PN}" |
58 | 58 | ||