diff options
author | Zoltan Boszormenyi <zboszor@gmail.com> | 2024-05-02 06:46:00 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-05-28 09:38:22 +0100 |
commit | 2490d0c12cd69f19e57cad568ab420da40cae830 (patch) | |
tree | 00a7649a27e4f852f04c096825b5fd363d313efb /meta | |
parent | f66f8fa9f605d5dc39acb10226198b3ab40dcaa3 (diff) | |
download | poky-2490d0c12cd69f19e57cad568ab420da40cae830.tar.gz |
cdrtools-native: Fix build with GCC 14
Add a patch to fix do_configure with GCC 14.
Disable building cdda2wav because it doesn't build with GCC 14.
(From OE-Core rev: 0fbe1766abb00edeb8ec9a0c8bdb4e723be4f352)
Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/cdrtools/cdrtools-native_3.01.bb | 6 | ||||
-rw-r--r-- | meta/recipes-devtools/cdrtools/cdrtools/gcc14-fix.patch | 13 |
2 files changed, 18 insertions, 1 deletions
diff --git a/meta/recipes-devtools/cdrtools/cdrtools-native_3.01.bb b/meta/recipes-devtools/cdrtools/cdrtools-native_3.01.bb index 4f70ac01db..9dc5caf87c 100644 --- a/meta/recipes-devtools/cdrtools/cdrtools-native_3.01.bb +++ b/meta/recipes-devtools/cdrtools/cdrtools-native_3.01.bb | |||
@@ -13,7 +13,8 @@ DEPENDS += "gnu-config-native" | |||
13 | SRC_URI = " \ | 13 | SRC_URI = " \ |
14 | ${SOURCEFORGE_MIRROR}/project/cdrtools/cdrtools-${PV}.tar.bz2 \ | 14 | ${SOURCEFORGE_MIRROR}/project/cdrtools/cdrtools-${PV}.tar.bz2 \ |
15 | file://0001-Don-t-set-uid-gid-during-install.patch \ | 15 | file://0001-Don-t-set-uid-gid-during-install.patch \ |
16 | file://riscv64-linux-gcc.rul \ | 16 | file://riscv64-linux-gcc.rul \ |
17 | file://gcc14-fix.patch \ | ||
17 | " | 18 | " |
18 | 19 | ||
19 | SRC_URI[md5sum] = "7d45c5b7e1f78d85d1583b361aee6e8b" | 20 | SRC_URI[md5sum] = "7d45c5b7e1f78d85d1583b361aee6e8b" |
@@ -31,6 +32,9 @@ inherit native | |||
31 | CFLAGS += "-std=gnu89" | 32 | CFLAGS += "-std=gnu89" |
32 | 33 | ||
33 | do_configure() { | 34 | do_configure() { |
35 | # cdda2wav does not build with GCC 14 | ||
36 | rm -f ${S}/TARGETS/55cdda2wav | ||
37 | |||
34 | install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}/autoconf | 38 | install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}/autoconf |
35 | install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}/autoconf | 39 | install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}/autoconf |
36 | install -m 0644 ${UNPACKDIR}/riscv64-linux-gcc.rul ${S}/RULES/ | 40 | install -m 0644 ${UNPACKDIR}/riscv64-linux-gcc.rul ${S}/RULES/ |
diff --git a/meta/recipes-devtools/cdrtools/cdrtools/gcc14-fix.patch b/meta/recipes-devtools/cdrtools/cdrtools/gcc14-fix.patch new file mode 100644 index 0000000000..ce02bb8bcf --- /dev/null +++ b/meta/recipes-devtools/cdrtools/cdrtools/gcc14-fix.patch | |||
@@ -0,0 +1,13 @@ | |||
1 | Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com> | ||
2 | Upstream-Status: Inappropriate [native] | ||
3 | --- cdrtools-3.01/autoconf/configure~ 2015-07-06 23:41:27.000000000 +0200 | ||
4 | +++ cdrtools-3.01/autoconf/configure 2024-05-01 09:37:40.897253690 +0200 | ||
5 | @@ -1205,7 +1205,7 @@ | ||
6 | #line 1206 "configure" | ||
7 | #include "confdefs.h" | ||
8 | |||
9 | -main(){return(0);} | ||
10 | +int main(){return(0);} | ||
11 | EOF | ||
12 | if { (eval echo configure:1211: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
13 | ac_cv_prog_cc_works=yes | ||