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

Neumann-A · web-flow · commit d00bfc5a86fd · 2024-12-16T12:05:45.000-05:00
diff --git a/ports/mongo-c-driver/portfile.cmake b/ports/mongo-c-driver/portfile.cmake
@@ -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")
diff --git a/ports/mongo-c-driver/remove_abs_patch.cmake b/ports/mongo-c-driver/remove_abs_patch.cmake
@@ -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})
+ 
diff --git a/ports/mongo-c-driver/vcpkg.json b/ports/mongo-c-driver/vcpkg.json
@@ -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,
diff --git a/versions/baseline.json b/versions/baseline.json
@@ -6038,7 +6038,7 @@
     },
     "mongo-c-driver": {
       "baseline": "1.29.1",
-      "port-version": 0
+      "port-version": 1
     },
     "mongo-cxx-driver": {
       "baseline": "3.11.0",
diff --git a/versions/m-/mongo-c-driver.json b/versions/m-/mongo-c-driver.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f9943a1e42f7e9c6e4abdde3ae62a31bbee43c1f",
+      "version": "1.29.1",
+      "port-version": 1
+    },
     {
       "git-tree": "57c165af3c3c82c0f1f05f0f9e9e90af1fb68b50",
       "version": "1.29.1",

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ vcpkg_from_github(`
`10`	`10`	`fix-dependencies.patch`
`11`	`11`	`fix-include-directory.patch`
`12`	`12`	`fix-mingw.patch`
	`13`	`+ remove_abs_patch.cmake`
`13`	`14`	`)`
`14`	`15`	`file(WRITE "${SOURCE_PATH}/VERSION_CURRENT" "${VERSION}")`
`15`	`16`	`file(TOUCH "${SOURCE_PATH}/src/utf8proc-editable")`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "mongo-c-driver",`
`3`	`3`	`"version": "1.29.1",`
	`4`	`+ "port-version": 1,`
`4`	`5`	`"description": "Client library written in C for MongoDB.",`
`5`	`6`	`"homepage": "https://github.com/mongodb/mongo-c-driver",`
`6`	`7`	`"license": null,`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,10 @@`
`1`	`1`	`{`
`2`	`2`	`"versions": [`
	`3`	`+ {`
	`4`	`+ "git-tree": "f9943a1e42f7e9c6e4abdde3ae62a31bbee43c1f",`
	`5`	`+ "version": "1.29.1",`
	`6`	`+ "port-version": 1`
	`7`	`+ },`
`3`	`8`	`{`
`4`	`9`	`"git-tree": "57c165af3c3c82c0f1f05f0f9e9e90af1fb68b50",`
`5`	`10`	`"version": "1.29.1",`