summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/python
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-devtools/python
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-devtools/python')
-rw-r--r--meta/recipes-devtools/python/python3-bcrypt_4.1.3.bb2
-rw-r--r--meta/recipes-devtools/python/python3-maturin_1.6.0.bb2
-rw-r--r--meta/recipes-devtools/python/python3_3.12.4.bb2
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-devtools/python/python3-bcrypt_4.1.3.bb b/meta/recipes-devtools/python/python3-bcrypt_4.1.3.bb
index deb5cbdee3..9bed5ee148 100644
--- a/meta/recipes-devtools/python/python3-bcrypt_4.1.3.bb
+++ b/meta/recipes-devtools/python/python3-bcrypt_4.1.3.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8f7bb094c7232b058c7e9f2e431f389c"
4HOMEPAGE = "https://pypi.org/project/bcrypt/" 4HOMEPAGE = "https://pypi.org/project/bcrypt/"
5 5
6DEPENDS += "python3-cffi-native" 6DEPENDS += "python3-cffi-native"
7LDFLAGS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', ' -fuse-ld=bfd', '', d)}" 7LDFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', '-fuse-ld=bfd', '', d)}"
8 8
9SRC_URI[sha256sum] = "2ee15dd749f5952fe3f0430d0ff6b74082e159c50332a1413d51b5689cf06623" 9SRC_URI[sha256sum] = "2ee15dd749f5952fe3f0430d0ff6b74082e159c50332a1413d51b5689cf06623"
10 10
diff --git a/meta/recipes-devtools/python/python3-maturin_1.6.0.bb b/meta/recipes-devtools/python/python3-maturin_1.6.0.bb
index 1d62671bb9..ea8cf468ff 100644
--- a/meta/recipes-devtools/python/python3-maturin_1.6.0.bb
+++ b/meta/recipes-devtools/python/python3-maturin_1.6.0.bb
@@ -9,7 +9,7 @@ SRC_URI[sha256sum] = "b955025c24c8babc808db49e0ff90db8b4b1320dcc16b14eb261328417
9 9
10S = "${WORKDIR}/maturin-${PV}" 10S = "${WORKDIR}/maturin-${PV}"
11 11
12CFLAGS:append = " -fdebug-prefix-map=${CARGO_HOME}=${TARGET_DBGSRC_DIR}/cargo_home" 12CFLAGS += "-fdebug-prefix-map=${CARGO_HOME}=${TARGET_DBGSRC_DIR}/cargo_home"
13 13
14DEPENDS += "\ 14DEPENDS += "\
15 python3-setuptools-rust-native \ 15 python3-setuptools-rust-native \
diff --git a/meta/recipes-devtools/python/python3_3.12.4.bb b/meta/recipes-devtools/python/python3_3.12.4.bb
index eb3866d9be..77bbfaa069 100644
--- a/meta/recipes-devtools/python/python3_3.12.4.bb
+++ b/meta/recipes-devtools/python/python3_3.12.4.bb
@@ -118,7 +118,7 @@ ${@bb.utils.contains('PACKAGECONFIG', 'tk', '', '_tkinter', d)}
118EOF 118EOF
119} 119}
120 120
121CPPFLAGS:append = " -I${STAGING_INCDIR}/ncursesw -I${STAGING_INCDIR}/uuid" 121CPPFLAGS += "-I${STAGING_INCDIR}/ncursesw -I${STAGING_INCDIR}/uuid"
122 122
123# COMPILEALL_OPTS= ensures that .pyc are not compiled in parallel 123# COMPILEALL_OPTS= ensures that .pyc are not compiled in parallel
124# This was found to lock up builds, break reproducibility, and produce strange file ownership 124# This was found to lock up builds, break reproducibility, and produce strange file ownership