diff options
| author | Khem Raj <khem.raj@oss.qualcomm.com> | 2026-03-24 10:04:59 -0700 |
|---|---|---|
| committer | Khem Raj <khem.raj@oss.qualcomm.com> | 2026-03-24 10:05:54 -0700 |
| commit | ff7df48cac57d3c6bdff3cda53aa6a477a1e9b60 (patch) | |
| tree | dbd0dd89c8d78d28d453cc54f46a35e697f6f0ce /meta-oe | |
| parent | 1af5024f281399b49fff2c565de97c2a578cfe86 (diff) | |
| download | meta-openembedded-ff7df48cac57d3c6bdff3cda53aa6a477a1e9b60.tar.gz | |
canopenterm: Disable pinning lua to expect c89
Fixes build with latest lua
Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
Diffstat (limited to 'meta-oe')
| -rw-r--r-- | meta-oe/recipes-extended/canopenterm/canopenterm/0001-cmake-Do-not-pin-to-c89-constructs-on-linux.patch | 33 | ||||
| -rw-r--r-- | meta-oe/recipes-extended/canopenterm/canopenterm_1.0.13.bb | 3 |
2 files changed, 35 insertions, 1 deletions
diff --git a/meta-oe/recipes-extended/canopenterm/canopenterm/0001-cmake-Do-not-pin-to-c89-constructs-on-linux.patch b/meta-oe/recipes-extended/canopenterm/canopenterm/0001-cmake-Do-not-pin-to-c89-constructs-on-linux.patch new file mode 100644 index 0000000000..e6213c473d --- /dev/null +++ b/meta-oe/recipes-extended/canopenterm/canopenterm/0001-cmake-Do-not-pin-to-c89-constructs-on-linux.patch | |||
| @@ -0,0 +1,33 @@ | |||
| 1 | From 694563e023a296ecfd4c73fac681509323c14ada Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <khem.raj@oss.qualcomm.com> | ||
| 3 | Date: Tue, 24 Mar 2026 10:01:59 -0700 | ||
| 4 | Subject: [PATCH] cmake: Do not pin to c89 constructs on linux | ||
| 5 | |||
| 6 | This does not work with latest lua | ||
| 7 | |||
| 8 | Fixes | ||
| 9 | | 91 | #error "POSIX is not compatible with C89" | ||
| 10 | | | ^ | ||
| 11 | | 1 error generated. | ||
| 12 | | [44/51] Building C object CMakeFiles/crossline.dir/src/crossline/crossline.c.o | ||
| 13 | |||
| 14 | Upstream-Status: Pending | ||
| 15 | |||
| 16 | Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com> | ||
| 17 | --- | ||
| 18 | cmake/os_linux.cmake | 2 +- | ||
| 19 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 20 | |||
| 21 | diff --git a/cmake/os_linux.cmake b/cmake/os_linux.cmake | ||
| 22 | index 7096cbd..ef18d56 100644 | ||
| 23 | --- a/cmake/os_linux.cmake | ||
| 24 | +++ b/cmake/os_linux.cmake | ||
| 25 | @@ -56,7 +56,7 @@ if (BUILD_YOCTO) | ||
| 26 | if (LUA_FOUND) | ||
| 27 | include_directories(${LUA_INCLUDE_DIR}) | ||
| 28 | set(PLATFORM_LIBS ${PLATFORM_LIBS} ${LUA_LIBRARIES}) | ||
| 29 | - add_compile_definitions(LUA_USE_C89 LUA_USE_LINUX) | ||
| 30 | + add_compile_definitions(LUA_USE_LINUX) | ||
| 31 | else() | ||
| 32 | message(FATAL_ERROR "Lua not found") | ||
| 33 | endif() | ||
diff --git a/meta-oe/recipes-extended/canopenterm/canopenterm_1.0.13.bb b/meta-oe/recipes-extended/canopenterm/canopenterm_1.0.13.bb index a81ed30f72..25c7d97451 100644 --- a/meta-oe/recipes-extended/canopenterm/canopenterm_1.0.13.bb +++ b/meta-oe/recipes-extended/canopenterm/canopenterm_1.0.13.bb | |||
| @@ -15,7 +15,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=5f8a62fabd50ce3f1d7794bc849ae7a5" | |||
| 15 | 15 | ||
| 16 | DEPENDS = "cjson libinih libsdl3 lua libsocketcan pocketpy" | 16 | DEPENDS = "cjson libinih libsdl3 lua libsocketcan pocketpy" |
| 17 | 17 | ||
| 18 | SRC_URI = "git://github.com/CANopenTerm/CANopenTerm.git;protocol=https;branch=main" | 18 | SRC_URI = "git://github.com/CANopenTerm/CANopenTerm.git;protocol=https;branch=main \ |
| 19 | file://0001-cmake-Do-not-pin-to-c89-constructs-on-linux.patch" | ||
| 19 | 20 | ||
| 20 | SRCREV = "b0555360e5e8b444a2a9e14088fd253412184eb8" | 21 | SRCREV = "b0555360e5e8b444a2a9e14088fd253412184eb8" |
| 21 | 22 | ||
