Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Mongo-c-driver] remove compiler abs path #42731

Merged
merged 2 commits into from
Dec 16, 2024
Merged

[Mongo-c-driver] remove compiler abs path #42731

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
342854d
[mongo-c-driver] remove abs compiler path
Neumann-A Dec 16, 2024
5a2a9bd
v db
Neumann-A Dec 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ports/mongo-c-driver/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ vcpkg_from_github(
fix-dependencies.patch
fix-include-directory.patch
fix-mingw.patch
remove_abs_patch.cmake
)
file(WRITE "${SOURCE_PATH}/VERSION_CURRENT" "${VERSION}")
file(TOUCH "${SOURCE_PATH}/src/utf8proc-editable")
Expand Down
13 changes: 13 additions & 0 deletions ports/mongo-c-driver/remove_abs_patch.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/src/libmongoc/CMakeLists.txt b/src/libmongoc/CMakeLists.txt
index 6e295d68fb..54ab225ba7 100644
--- a/src/libmongoc/CMakeLists.txt
+++ b/src/libmongoc/CMakeLists.txt
@@ -474,7 +474,7 @@ if (NOT WIN32)
mongoc_get_accept_args (MONGOC_SOCKET_ARG2 MONGOC_SOCKET_ARG3)
endif ()

-set (MONGOC_CC ${CMAKE_C_COMPILER})
+cmake_path(GET CMAKE_C_COMPILER FILENAME MONGOC_CC)
set (MONGOC_USER_SET_CFLAGS ${CMAKE_C_FLAGS})
set (MONGOC_USER_SET_LDFLAGS ${CMAKE_EXE_LINKER_FLAGS})

1 change: 1 addition & 0 deletions ports/mongo-c-driver/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "mongo-c-driver",
"version": "1.29.1",
"port-version": 1,
"description": "Client library written in C for MongoDB.",
"homepage": "https://github.com/mongodb/mongo-c-driver",
"license": null,
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6038,7 +6038,7 @@
},
"mongo-c-driver": {
"baseline": "1.29.1",
"port-version": 0
"port-version": 1
},
"mongo-cxx-driver": {
"baseline": "3.11.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/m-/mongo-c-driver.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "f9943a1e42f7e9c6e4abdde3ae62a31bbee43c1f",
"version": "1.29.1",
"port-version": 1
},
{
"git-tree": "57c165af3c3c82c0f1f05f0f9e9e90af1fb68b50",
"version": "1.29.1",
Expand Down