From cfd0dc5ca2af104537371edc2a264a70806a453b Mon Sep 17 00:00:00 2001 From: Michele Locati Date: Fri, 6 Feb 2026 08:42:11 +0100 Subject: [PATCH 1/2] [temp] Temporarily disable building with gcc --- .github/workflows/build.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c5461fc..822f12d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -261,18 +261,18 @@ jobs: fail-fast: false matrix: include: - - bits: 32 - link: shared - compiler: gcc - - bits: 32 - link: static - compiler: gcc - - bits: 64 - link: shared - compiler: gcc - - bits: 64 - link: static - compiler: gcc + #- bits: 32 + # link: shared + # compiler: gcc + #- bits: 32 + # link: static + # compiler: gcc + #- bits: 64 + # link: shared + # compiler: gcc + #- bits: 64 + # link: static + # compiler: gcc - bits: 32 link: shared compiler: msvc From 24e0c5104e118925244e8879aa24009f06c1a742 Mon Sep 17 00:00:00 2001 From: Michele Locati Date: Fri, 6 Feb 2026 08:41:11 +0100 Subject: [PATCH 2/2] Build spit.exe with msvc too --- service/case-vars.ps1 | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/service/case-vars.ps1 b/service/case-vars.ps1 index a4d43d1..41b410a 100644 --- a/service/case-vars.ps1 +++ b/service/case-vars.ps1 @@ -85,6 +85,9 @@ $cygwinPackages = @( 'unzip' 'patch' ) +if ($JsonCVersionDefault) { + $cygwinPackages += 'cmake' +} $cygwinPath = @( "$cygwinInstalledPath/bin" ) @@ -99,9 +102,6 @@ if ($Compiler -eq 'gcc') { "mingw64-$mingwArchitecture-headers" "mingw64-$mingwArchitecture-runtime" ) - if ($JsonCVersionDefault) { - $cygwinPackages += 'cmake' - } $cygwinPath += @( "/usr/$mingwHost/bin" "/usr/$mingwHost/sys-root/mingw/bin" @@ -190,7 +190,7 @@ if ($Compiler -eq 'gcc') { } else { $SignpathSigningPolicy = '' } - $CollectPrograms = $false + $CollectPrograms = $true } else { throw "Unsupported compiler '$Compiler'" } @@ -257,7 +257,7 @@ switch ($Link) { # Curl configuration $curlConfigureArgs = @() -if ($CurlVersionDefault -and $Compiler -eq 'gcc') { +if ($CurlVersionDefault) { $CurlVersion = $CurlVersionDefault $curlConfigureArgs = @( "CC=$cc" @@ -334,7 +334,7 @@ if ($CurlVersionDefault -and $Compiler -eq 'gcc') { # JSON-C configuration $jsonCCMakeArgs = @() -if ($JsonCVersionDefault -and $Compiler -eq 'gcc') { +if ($JsonCVersionDefault) { $JsonCVersion = $JsonCVersionDefault $jsonCCMakeArgs = @( "-DCMAKE_C_COMPILER=$cc" @@ -379,7 +379,7 @@ if ($JsonCVersionDefault -and $Compiler -eq 'gcc') { # Gettext configuration $gettextCPPFlags = $cppFlags -join ' ' -if ($CurlVersion -and $Link -eq 'static' -and $Compiler -eq 'gcc') { +if ($CurlVersion -and $Link -eq 'static') { $gettextCPPFlags += ' -DCURL_STATICLIB' } $gettextConfigureArgs = @( @@ -445,7 +445,7 @@ switch ($Link) { ) } } -$checkSpitExe = $Compiler -eq 'gcc' -and (Compare-Versions $GettextVersion '1.0') -ge 0 +$checkSpitExe = (Compare-Versions $GettextVersion '1.0') -ge 0 $gettextIgnoreCTests = @() # see https://lists.gnu.org/archive/html/bug-gnulib/2024-09/msg00137.html $gettextIgnoreCTests += 'gettext-tools/gnulib-tests/test-asyncsafe-spin2.c'