summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-multimedia/recipes-multimedia/webrtc-audio-processing/webrtc-audio-processing-2_2.1.bb3
-rwxr-xr-xmeta-oe/conf/include/non-repro-meta-oe.inc3
-rw-r--r--meta-oe/recipes-graphics/libglvnd/libglvnd_1.7.0.bb4
-rw-r--r--meta-oe/recipes-kernel/crash/crash.inc1
-rw-r--r--meta-oe/recipes-kernel/crash/crash/0001-Use-CC-env-var-to-get-compiler-version.patch48
5 files changed, 7 insertions, 52 deletions
diff --git a/meta-multimedia/recipes-multimedia/webrtc-audio-processing/webrtc-audio-processing-2_2.1.bb b/meta-multimedia/recipes-multimedia/webrtc-audio-processing/webrtc-audio-processing-2_2.1.bb
index 00bf26c750..8eab2c4ff0 100644
--- a/meta-multimedia/recipes-multimedia/webrtc-audio-processing/webrtc-audio-processing-2_2.1.bb
+++ b/meta-multimedia/recipes-multimedia/webrtc-audio-processing/webrtc-audio-processing-2_2.1.bb
@@ -16,5 +16,6 @@ SRC_URI[sha256sum] = "ae9302824b2038d394f10213cab05312c564a038434269f11dbf68f511
16S = "${WORKDIR}/webrtc-audio-processing-${PV}" 16S = "${WORKDIR}/webrtc-audio-processing-${PV}"
17 17
18LDFLAGS:append:libc-musl = " -lexecinfo" 18LDFLAGS:append:libc-musl = " -lexecinfo"
19 19# | riscv32-yoe-linux-musl-ld.lld: error: undefined reference: __atomic_store_8
20LDFLAGS:append:riscv32 = " -latomic"
20inherit meson pkgconfig 21inherit meson pkgconfig
diff --git a/meta-oe/conf/include/non-repro-meta-oe.inc b/meta-oe/conf/include/non-repro-meta-oe.inc
index ae4fb1d194..894d7f330a 100755
--- a/meta-oe/conf/include/non-repro-meta-oe.inc
+++ b/meta-oe/conf/include/non-repro-meta-oe.inc
@@ -7,6 +7,9 @@ KNOWN_NON_REPRO_META_OE = " \
7 asio-ptest \ 7 asio-ptest \
8 asio-src \ 8 asio-src \
9 cpuid-doc \ 9 cpuid-doc \
10 crash \
11 crash-dbg \
12 crash-src \
10 dhrystone \ 13 dhrystone \
11 dhrystone-dbg \ 14 dhrystone-dbg \
12 dhrystone-dev \ 15 dhrystone-dev \
diff --git a/meta-oe/recipes-graphics/libglvnd/libglvnd_1.7.0.bb b/meta-oe/recipes-graphics/libglvnd/libglvnd_1.7.0.bb
index 8f80358963..a737a735b7 100644
--- a/meta-oe/recipes-graphics/libglvnd/libglvnd_1.7.0.bb
+++ b/meta-oe/recipes-graphics/libglvnd/libglvnd_1.7.0.bb
@@ -22,8 +22,8 @@ PACKAGECONFIG ?= "\
22 " 22 "
23 23
24PACKAGECONFIG[x11] = "-Dx11=enabled,-Dx11=disabled,libx11 libxext xorgproto" 24PACKAGECONFIG[x11] = "-Dx11=enabled,-Dx11=disabled,libx11 libxext xorgproto"
25PACKAGECONFIG[glx] = "-Dglx=enabled,-Dglx=disabled,libx11 libxext xorgproto" 25PACKAGECONFIG[glx] = "-Dglx=enabled,-Dglx=disabled,libx11 libxext xorgproto,,libglx-icd"
26PACKAGECONFIG[egl] = "-Degl=true,-Degl=false," 26PACKAGECONFIG[egl] = "-Degl=true,-Degl=false,,libegl-icd"
27PACKAGECONFIG[gles1] = "-Dgles1=true,-Dgles1=false," 27PACKAGECONFIG[gles1] = "-Dgles1=true,-Dgles1=false,"
28PACKAGECONFIG[gles2] = "-Dgles2=true,-Dgles2=false," 28PACKAGECONFIG[gles2] = "-Dgles2=true,-Dgles2=false,"
29 29
diff --git a/meta-oe/recipes-kernel/crash/crash.inc b/meta-oe/recipes-kernel/crash/crash.inc
index 45fc9cd1fd..aef77be1a0 100644
--- a/meta-oe/recipes-kernel/crash/crash.inc
+++ b/meta-oe/recipes-kernel/crash/crash.inc
@@ -27,7 +27,6 @@ SRC_URI = "git://github.com/crash-utility/${BPN}.git;branch=master;protocol=http
27 file://0003-Fix-build-failure-in-readline-lib.patch \ 27 file://0003-Fix-build-failure-in-readline-lib.patch \
28 file://0004-tools.c-do-not-use-keywords-nullptr-as-a-variable-in.patch \ 28 file://0004-tools.c-do-not-use-keywords-nullptr-as-a-variable-in.patch \
29 file://0005-Fix-build-failure-on-32bit-machine-i686.patch \ 29 file://0005-Fix-build-failure-on-32bit-machine-i686.patch \
30 file://0001-Use-CC-env-var-to-get-compiler-version.patch \
31 " 30 "
32SRCREV = "f13853cef53f5c5463a51021edbc81977e2b1405" 31SRCREV = "f13853cef53f5c5463a51021edbc81977e2b1405"
33 32
diff --git a/meta-oe/recipes-kernel/crash/crash/0001-Use-CC-env-var-to-get-compiler-version.patch b/meta-oe/recipes-kernel/crash/crash/0001-Use-CC-env-var-to-get-compiler-version.patch
deleted file mode 100644
index d51008886e..0000000000
--- a/meta-oe/recipes-kernel/crash/crash/0001-Use-CC-env-var-to-get-compiler-version.patch
+++ /dev/null
@@ -1,48 +0,0 @@
1From 31b789d1b21ed26315d08798d6044450e3545ddf Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?K=C3=A9l=C3=A9fa=20San=C3=A9?= <kelefa.sane@smile.fr>
3Date: Fri, 16 May 2025 16:18:28 +0200
4Subject: [PATCH] Use CC env var to get compiler version
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9The source file build_data.c generated at compilation time define a
10variable compiler_version which is obtained by calling "gcc --version"
11cmd. This call retrieve the native gcc compiler install on host build
12machine but not necessarily the compiler use to build the project (ex:
13cross compilation).
14
15The CC env variable commonly used in Makefile project define the
16compiler to use at build, so this is the appropriate way to retrieve the
17compiler version, when the CC env var is define.
18
19Upstream-Status: Submitted [https://lists.crash-utility.osci.io/archives/list/devel@lists.crash-utility.osci.io/thread/MIPWYZGF3EIC47FVNNYK77FI4ZJ3FHON/]
20
21Signed-off-by: Kéléfa Sané <kelefa.sane@smile.fr>
22---
23 configure.c | 12 +++++++++++-
24 1 file changed, 11 insertions(+), 1 deletion(-)
25
26diff --git a/configure.c b/configure.c
27index 4668c9a..a20e174 100644
28--- a/configure.c
29+++ b/configure.c
30@@ -1362,7 +1362,17 @@ make_build_data(char *target)
31
32 fp1 = popen("date", "r");
33 fp2 = popen("id", "r");
34- fp3 = popen("gcc --version", "r");
35+
36+ const char *cc_env = getenv("CC");
37+ if(NULL == cc_env) {
38+ fp3 = popen("gcc --version", "r");
39+ }
40+ else {
41+ char compiler_version_cmd[512];
42+
43+ snprintf(compiler_version_cmd, sizeof(compiler_version_cmd)-1, "%s --version", cc_env);
44+ fp3 = popen(compiler_version_cmd, "r");
45+ }
46
47 if ((fp4 = fopen("build_data.c", "w")) == NULL) {
48 perror("build_data.c");