From 7a3c94878b9b5d3e9eb2a31cd544609a4954b380 Mon Sep 17 00:00:00 2001 From: Vitalii Koshura Date: Thu, 20 Jul 2023 21:33:44 +0200 Subject: [PATCH] [boinc] fix build with mingw (#32659) --- ports/boinc/CMakeLists.txt | 8 ++++++++ ports/boinc/portfile.cmake | 7 +++++++ ports/boinc/vcpkg.json | 2 +- versions/b-/boinc.json | 5 +++++ versions/baseline.json | 2 +- 5 files changed, 22 insertions(+), 2 deletions(-) diff --git a/ports/boinc/CMakeLists.txt b/ports/boinc/CMakeLists.txt index 91996a8ab77c79..c4a111a6c57288 100644 --- a/ports/boinc/CMakeLists.txt +++ b/ports/boinc/CMakeLists.txt @@ -168,6 +168,12 @@ if(WIN32 OR APPLE) set_target_properties(boincapi PROPERTIES IMPORT_PREFIX "lib") endif() +# currently this is for MinGW only +set(build_options "") +if(HAVE_STRCASECMP) + list(APPEND build_options "-DHAVE_STRCASECMP") +endif() + if(APPLE) target_include_directories(boinc PUBLIC $ @@ -183,12 +189,14 @@ elseif(WIN32) -D_CRT_SECURE_NO_WARNINGS -DWIN32 -D_CONSOLE + ${build_options} ) target_compile_definitions(boincapi PUBLIC -D_CRT_SECURE_NO_WARNINGS -DWIN32 -D_CONSOLE + ${build_options} ) target_include_directories(boinc PUBLIC diff --git a/ports/boinc/portfile.cmake b/ports/boinc/portfile.cmake index fc173f5815b152..e9f6fda7360c10 100644 --- a/ports/boinc/portfile.cmake +++ b/ports/boinc/portfile.cmake @@ -30,8 +30,15 @@ if(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_ANDROID) endif() endif() +set(build_options "") +if(VCPKG_TARGET_IS_MINGW) + list(APPEND build_options "-DHAVE_STRCASECMP=ON") +endif() + vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} + OPTIONS + ${build_options} ) vcpkg_cmake_install() diff --git a/ports/boinc/vcpkg.json b/ports/boinc/vcpkg.json index 391356f27d2393..9944ba42c57f00 100644 --- a/ports/boinc/vcpkg.json +++ b/ports/boinc/vcpkg.json @@ -1,7 +1,7 @@ { "name": "boinc", "version": "7.22.2", - "port-version": 1, + "port-version": 2, "description": "Open-source software for volunteer computing and grid computing.", "homepage": "https://boinc.berkeley.edu/", "license": "LGPL-3.0-or-later", diff --git a/versions/b-/boinc.json b/versions/b-/boinc.json index 4f420acdd77a01..e28e932c6cf5c6 100644 --- a/versions/b-/boinc.json +++ b/versions/b-/boinc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a90973a47e6ea052123787fd347b6dc68c8f77de", + "version": "7.22.2", + "port-version": 2 + }, { "git-tree": "61b5ebb30db7da8972a235b11ffc92f667c597eb", "version": "7.22.2", diff --git a/versions/baseline.json b/versions/baseline.json index 55a28b61ddfb3b..389f2d496d9bb9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -626,7 +626,7 @@ }, "boinc": { "baseline": "7.22.2", - "port-version": 1 + "port-version": 2 }, "bond": { "baseline": "10.0.0",