diff --git a/ports/soci/portfile.cmake b/ports/soci/portfile.cmake index 1adeded035..4320e0392e 100644 --- a/ports/soci/portfile.cmake +++ b/ports/soci/portfile.cmake @@ -26,6 +26,8 @@ vcpkg_cmake_configure( -DSOCI_TESTS=OFF -DSOCI_INSTALL=ON -DSOCI_FMT_BUILTIN=OFF + -DSOCI_SQLITE3_BUILTIN=OFF + -DSOCI_LTO=OFF # SOCI components whose backends are not yet available through vcpkg -DSOCI_DB2=OFF -DSOCI_FIREBIRD=OFF @@ -33,6 +35,7 @@ vcpkg_cmake_configure( ${options} MAYBE_UNUSED_VARIABLES CMAKE_REQUIRE_FIND_PACKAGE_Boost + SOCI_SQLITE3_BUILTIN ) vcpkg_cmake_install() diff --git a/ports/soci/vcpkg.json b/ports/soci/vcpkg.json index 8b3d83fcd6..89c9bd2f51 100644 --- a/ports/soci/vcpkg.json +++ b/ports/soci/vcpkg.json @@ -1,6 +1,7 @@ { "name": "soci", "version": "4.1.4", + "port-version": 1, "description": "SOCI - The C++ Database Access Library", "homepage": "https://soci.sourceforge.net/", "license": "BSL-1.0", diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt index 542407f4cd..3e06cab639 100644 --- a/scripts/ci.feature.baseline.txt +++ b/scripts/ci.feature.baseline.txt @@ -1303,8 +1303,6 @@ sleepy-discord(android)=fail slikenet:arm64-linux=fail smpeg2:arm64-linux=cascade soci[odbc]:arm64-linux=feature-fails # Could NOT find ODBC -soci[odbc]:arm64-windows=feature-fails # Internal compiler error in release mode -soci[postgresql]:arm64-windows=feature-fails # Internal compiler error in release mode soem:arm64-windows=cascade soem:x64-windows-static-md=cascade soem:x64-windows-static=cascade diff --git a/versions/baseline.json b/versions/baseline.json index 1c15d7e88e..9dd6e48229 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9542,7 +9542,7 @@ }, "soci": { "baseline": "4.1.4", - "port-version": 0 + "port-version": 1 }, "sockpp": { "baseline": "1.0.0", diff --git a/versions/s-/soci.json b/versions/s-/soci.json index 13cf56779f..4213ab9660 100644 --- a/versions/s-/soci.json +++ b/versions/s-/soci.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2bac7412c9f1009e795339faef5f6140a0ac1003", + "version": "4.1.4", + "port-version": 1 + }, { "git-tree": "830981cf487e7150fc4309c6c66ae7763a47329b", "version": "4.1.4",