From 034c52b86fd32f0647a7941a02f9756230bf869b Mon Sep 17 00:00:00 2001 From: Frank Halasz Date: Wed, 18 Mar 2026 00:25:28 -0700 Subject: [PATCH] In CMakelists, limit use of libbsd for linux to cases where libc does not include strlcat --- CMakeLists.txt | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8f3d311..0f01aa1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,9 +37,12 @@ IF(NEED_LIB_M) ENDIF() IF (CMAKE_SYSTEM_NAME STREQUAL "Linux") - find_package(PkgConfig REQUIRED) - pkg_check_modules(LIBBSD-OVERLAY REQUIRED IMPORTED_TARGET "libbsd-overlay") - SET(MAIKO_LIBRARIES ${MAIKO_LIBRARIES} PkgConfig::LIBBSD-OVERLAY) + CHECK_LIBRARY_EXISTS(c strlcat "" NO_NEED_FOR_LIBBSD) + IF(NOT NO_NEED_FOR_LIBBSD) + find_package(PkgConfig REQUIRED) + pkg_check_modules(LIBBSD-OVERLAY REQUIRED IMPORTED_TARGET "libbsd-overlay") + SET(MAIKO_LIBRARIES ${MAIKO_LIBRARIES} PkgConfig::LIBBSD-OVERLAY) + ENDIF() ENDIF() SET (MAIKO_RELEASE 351 CACHE STRING "Release version to build. Release: 115, 200, 201, 210, 300, 350, 351") @@ -559,7 +562,9 @@ if(NOT res EQUAL 0) message(FATAL_ERROR "machinetype script failed") endif() -set(release_dir "${os_ver}.${machine_type}")INSTALL(TARGETS lde DESTINATION ${release_dir}) +set(release_dir "${os_ver}.${machine_type}") + +INSTALL(TARGETS lde DESTINATION ${release_dir}) IF(MAIKO_DISPLAY_X11) INSTALL(TARGETS ldex ldeinit DESTINATION ${release_dir})