From dd0eb77f08b50738fdeba82b9fb050421eb0f8d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Mon, 21 Jun 2021 15:37:36 +0200 Subject: [PATCH 1/4] Fix mongo-c-driver for custom VCPKG_BUILD_TYPE --- ports/mongo-c-driver/portfile.cmake | 32 ++++++++++++++++++----------- 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/ports/mongo-c-driver/portfile.cmake b/ports/mongo-c-driver/portfile.cmake index 9ddf3a6b41da61..008cba48ac5514 100644 --- a/ports/mongo-c-driver/portfile.cmake +++ b/ports/mongo-c-driver/portfile.cmake @@ -86,19 +86,27 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) if (VCPKG_LIBRARY_LINKAGE STREQUAL static) if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_TARGET_IS_UWP) - file(RENAME - ${CURRENT_PACKAGES_DIR}/lib/libmongoc-static-1.0.a - ${CURRENT_PACKAGES_DIR}/lib/libmongoc-1.0.a) - file(RENAME - ${CURRENT_PACKAGES_DIR}/debug/lib/libmongoc-static-1.0.a - ${CURRENT_PACKAGES_DIR}/debug/lib/libmongoc-1.0.a) + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(RENAME + ${CURRENT_PACKAGES_DIR}/lib/libmongoc-static-1.0.a + ${CURRENT_PACKAGES_DIR}/lib/libmongoc-1.0.a) + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(RENAME + ${CURRENT_PACKAGES_DIR}/debug/lib/libmongoc-static-1.0.a + ${CURRENT_PACKAGES_DIR}/debug/lib/libmongoc-1.0.a) + endif() else() - file(RENAME - ${CURRENT_PACKAGES_DIR}/lib/mongoc-static-1.0.lib - ${CURRENT_PACKAGES_DIR}/lib/mongoc-1.0.lib) - file(RENAME - ${CURRENT_PACKAGES_DIR}/debug/lib/mongoc-static-1.0.lib - ${CURRENT_PACKAGES_DIR}/debug/lib/mongoc-1.0.lib) + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(RENAME + ${CURRENT_PACKAGES_DIR}/lib/mongoc-static-1.0.lib + ${CURRENT_PACKAGES_DIR}/lib/mongoc-1.0.lib) + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(RENAME + ${CURRENT_PACKAGES_DIR}/debug/lib/mongoc-static-1.0.lib + ${CURRENT_PACKAGES_DIR}/debug/lib/mongoc-1.0.lib) + endif() endif() # drop the __declspec(dllimport) when building static From 97a011a1dbd0876fe5ab283f7fd84566b5f23e19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Mon, 21 Jun 2021 15:38:09 +0200 Subject: [PATCH 2/4] Update version --- ports/mongo-c-driver/CONTROL | 2 +- versions/baseline.json | 2 +- versions/m-/mongo-c-driver.json | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ports/mongo-c-driver/CONTROL b/ports/mongo-c-driver/CONTROL index 6472ce1a20fca9..54a225a02e5a46 100644 --- a/ports/mongo-c-driver/CONTROL +++ b/ports/mongo-c-driver/CONTROL @@ -1,6 +1,6 @@ Source: mongo-c-driver Version: 1.16.1 -Port-Version: 4 +Port-Version: 5 Build-Depends: libbson, openssl (!windows), zlib Description: Client library written in C for MongoDB. Homepage: https://github.com/mongodb/mongo-c-driver diff --git a/versions/baseline.json b/versions/baseline.json index e58be13dacbba3..ddc844a258b83f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4070,7 +4070,7 @@ }, "mongo-c-driver": { "baseline": "1.16.1", - "port-version": 4 + "port-version": 5 }, "mongo-cxx-driver": { "baseline": "3.4.0-5", diff --git a/versions/m-/mongo-c-driver.json b/versions/m-/mongo-c-driver.json index ae610504943f88..aa198877a678b6 100644 --- a/versions/m-/mongo-c-driver.json +++ b/versions/m-/mongo-c-driver.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7ae86483793836025c22828591bcf3808481fe46", + "version-string": "1.16.1", + "port-version": 5 + }, { "git-tree": "6b948f7f7ff67f47481c2630ba40ab300bceee01", "version-string": "1.16.1", From 1e481bd0db8e511633ce534d388080dd42dc6f09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Tue, 22 Jun 2021 10:56:49 +0800 Subject: [PATCH 3/4] Update ports/mongo-c-driver/portfile.cmake --- ports/mongo-c-driver/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/mongo-c-driver/portfile.cmake b/ports/mongo-c-driver/portfile.cmake index 008cba48ac5514..eca359bd6dc728 100644 --- a/ports/mongo-c-driver/portfile.cmake +++ b/ports/mongo-c-driver/portfile.cmake @@ -85,7 +85,7 @@ file(RENAME ${CURRENT_PACKAGES_DIR}/temp ${CURRENT_PACKAGES_DIR}/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_TARGET_IS_UWP) + if(NOT VCPKG_TARGET_IS_WINDOWS) if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") file(RENAME ${CURRENT_PACKAGES_DIR}/lib/libmongoc-static-1.0.a From b06ccf51fc58e6bad946c3062dfbfd70cb79b5e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Fri, 25 Jun 2021 15:04:19 +0800 Subject: [PATCH 4/4] Update versions/m-/mongo-c-driver.json --- versions/m-/mongo-c-driver.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/m-/mongo-c-driver.json b/versions/m-/mongo-c-driver.json index aa198877a678b6..033ff1e25338d8 100644 --- a/versions/m-/mongo-c-driver.json +++ b/versions/m-/mongo-c-driver.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "7ae86483793836025c22828591bcf3808481fe46", + "git-tree": "6a68782eaa1afe2fc3de47db769e230ebd542ca7", "version-string": "1.16.1", "port-version": 5 },