summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2024-06-13 09:31:52 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-07-01 13:58:08 +0100
commit3c1c56ec07d6f507077458faf5818ff4a88dce98 (patch)
treee6a795917e7fcbb7f57deb3878583470cf55fc26 /meta/recipes-connectivity
parent45aeae0075ead6f6509048857c4de213a7a302a8 (diff)
downloadpoky-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-connectivity')
-rw-r--r--meta/recipes-connectivity/bind/bind_9.18.27.bb2
-rw-r--r--meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.4.bb2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-connectivity/bind/bind_9.18.27.bb b/meta/recipes-connectivity/bind/bind_9.18.27.bb
index 98b8bb5513..0d22bace6f 100644
--- a/meta/recipes-connectivity/bind/bind_9.18.27.bb
+++ b/meta/recipes-connectivity/bind/bind_9.18.27.bb
@@ -44,7 +44,7 @@ EXTRA_OECONF = " --disable-auto-validation \
44 --sysconfdir=${sysconfdir}/bind \ 44 --sysconfdir=${sysconfdir}/bind \
45 --with-openssl=${STAGING_DIR_HOST}${prefix} \ 45 --with-openssl=${STAGING_DIR_HOST}${prefix} \
46 " 46 "
47LDFLAGS:append = " -lz" 47LDFLAGS += "-lz"
48 48
49# dhcp needs .la so keep them 49# dhcp needs .la so keep them
50REMOVE_LIBTOOL_LA = "0" 50REMOVE_LIBTOOL_LA = "0"
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.4.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.4.bb
index af7a74a5fb..9aa8bc4eab 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.4.bb
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.4.bb
@@ -62,7 +62,7 @@ EXTRA_OECONF = "--with-statduser=rpcuser \
62 --with-rpcgen=${HOSTTOOLS_DIR}/rpcgen \ 62 --with-rpcgen=${HOSTTOOLS_DIR}/rpcgen \
63 " 63 "
64 64
65LDFLAGS:append = " -lsqlite3 -levent" 65LDFLAGS += "-lsqlite3 -levent"
66 66
67PACKAGECONFIG ??= "tcp-wrappers \ 67PACKAGECONFIG ??= "tcp-wrappers \
68 ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \ 68 ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \