From f330a325dd3535e2bf1067997ef40b7fddcb7e35 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 19 Oct 2023 18:29:18 +0200 Subject: [PATCH] [boost-iostreams] Fix mingw (#34387) * [boost-iostreams] Fix mingw * run generate-ports.ps1 --------- Co-authored-by: Javier Matos Denizac --- ports/boost-iostreams/b2-options.cmake | 8 ++++---- ports/boost-iostreams/vcpkg.json | 1 + scripts/boost/generate-ports.ps1 | 2 ++ versions/b-/boost-iostreams.json | 5 +++++ versions/baseline.json | 2 +- 5 files changed, 13 insertions(+), 5 deletions(-) diff --git a/ports/boost-iostreams/b2-options.cmake b/ports/boost-iostreams/b2-options.cmake index b95c08db02..5b24d9d6dd 100644 --- a/ports/boost-iostreams/b2-options.cmake +++ b/ports/boost-iostreams/b2-options.cmake @@ -40,12 +40,12 @@ if("zlib" IN_LIST FEATURES) list(APPEND B2_OPTIONS -sZLIB_INCLUDE="${CURRENT_INSTALLED_DIR}/include" ) - # Overwride debug library name - if(CMAKE_BUILD_TYPE STREQUAL "Debug") - if(WIN32) + # Overwride windows library names + if(WIN32) + if(CMAKE_BUILD_TYPE STREQUAL "Debug") set(ZLIB_NAME zlibd) else() - set(ZLIB_NAME z) + set(ZLIB_NAME zlib) # for mingw endif() list(APPEND B2_OPTIONS -sZLIB_NAME=${ZLIB_NAME} diff --git a/ports/boost-iostreams/vcpkg.json b/ports/boost-iostreams/vcpkg.json index 935e3e2cb0..98ed0e15fc 100644 --- a/ports/boost-iostreams/vcpkg.json +++ b/ports/boost-iostreams/vcpkg.json @@ -2,6 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-iostreams", "version": "1.83.0", + "port-version": 1, "description": "Boost iostreams module", "homepage": "https://github.com/boostorg/iostreams", "license": "BSL-1.0", diff --git a/scripts/boost/generate-ports.ps1 b/scripts/boost/generate-ports.ps1 index a669d0635d..ca33285129 100644 --- a/scripts/boost/generate-ports.ps1 +++ b/scripts/boost/generate-ports.ps1 @@ -26,6 +26,8 @@ $defaultPortVersion = 0 $portVersions = @{ 'boost' = 1; 'boost-fiber' = 1; + 'boost-iostreams' = 1; + 'boost-modular-build-helper' = 1; } function Get-PortVersion { diff --git a/versions/b-/boost-iostreams.json b/versions/b-/boost-iostreams.json index 6539dc5982..f0a409a7a6 100644 --- a/versions/b-/boost-iostreams.json +++ b/versions/b-/boost-iostreams.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "be97780ebb3e46185f1838115f642ec2d110f76d", + "version": "1.83.0", + "port-version": 1 + }, { "git-tree": "da8972f0e4c59981021913e4ef16a39a9ff8d491", "version": "1.83.0", diff --git a/versions/baseline.json b/versions/baseline.json index 66e2459d21..ff880d9675 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -926,7 +926,7 @@ }, "boost-iostreams": { "baseline": "1.83.0", - "port-version": 0 + "port-version": 1 }, "boost-iterator": { "baseline": "1.83.0",