github/chiaki
1
0
Fork 0
mirror of https://git.sr.ht/~thestr4ng3r/chiaki synced 2025-08-20 21:43:12 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update dependencies and fix CI

Browse source 
* nanopb 0.4.6.4 with PB_C99_STATIC_ASSERT to avoid depending on C11
* OpenSSL 1.1.1q on windows
* Switched from docker to podman in CI
* Appdir in appimage build container is now in /build/appdir to fix
  "Invalid cross-device link" errors in linuxdeploy when appdir is in
  mount
* Use python protobuf==3.19.5 in bionic image, which still supports
  python 3.6, and on windows where nanopb otherwise has issues
* Purge nanopb_pb2.py to force regeneration of it for possibly different
  python protobuf versions in subsequent builds
* FreeBSD needs py39 packages now
This commit is contained in:
Florian Märkl 2022-09-11 14:00:59 +02:00
commit 4164255ef9
14 changed files with 48 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
third-party/CMakeLists.txt vendored
View file

@ -4,11 +4,13 @@ if(NOT CHIAKI_USE_SYSTEM_NANOPB)
# nanopb
##################
add_definitions(-DPB_C99_STATIC_ASSERT) # Fix PB_STATIC_ASSERT on msvc without using C11 for now
add_subdirectory(nanopb EXCLUDE_FROM_ALL)
set(NANOPB_GENERATOR_PY "${CMAKE_CURRENT_SOURCE_DIR}/nanopb/generator/nanopb_generator.py" PARENT_SCOPE)
add_library(nanopb INTERFACE)
target_link_libraries(nanopb INTERFACE protobuf-nanopb-static)
target_include_directories(nanopb INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/nanopb")
target_compile_definitions(nanopb INTERFACE -DPB_C99_STATIC_ASSERT) # see above
add_library(Nanopb::nanopb ALIAS nanopb)
endif()

2
third-party/nanopb vendored

@ -1 +1 @@
Subproject commit ab19ecbe1b9f377ab4ee8e762bfe16c39068ad68
Subproject commit afc499f9a410fc9bbf6c9c48cdd8d8b199d49eb4