[libgcrypt] no absolute paths (#21578)

microsoft · Nov 22, 2021 · e984c55 · e984c55
1 parent 41f86d7
commit e984c55
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/ports/libgcrypt/portfile.cmake b/ports/libgcrypt/portfile.cmake
@@ -10,7 +10,7 @@ vcpkg_from_git(
 
 vcpkg_configure_make(
     AUTOCONFIG
-    SOURCE_PATH ${SOURCE_PATH}
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         --disable-doc
         --disable-silent-rules
@@ -21,5 +21,8 @@ vcpkg_install_make()
 vcpkg_fixup_pkgconfig() 
 vcpkg_copy_pdbs()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
-file(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libgcrypt/bin/libgcrypt-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../..")
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libgcrypt/debug/bin/libgcrypt-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../../..")
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+file(INSTALL "${SOURCE_PATH}/COPYING.LIB" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/libgcrypt/vcpkg.json b/ports/libgcrypt/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "libgcrypt",
   "version": "1.9.4",
+  "port-version": 1,
   "description": "A general purpose cryptographic library",
   "homepage": "https://gnupg.org/software/libgcrypt/index.html",
   "supports": "linux | osx",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -3462,7 +3462,7 @@
     },
     "libgcrypt": {
       "baseline": "1.9.4",
-      "port-version": 0
+      "port-version": 1
     },
     "libgd": {
       "baseline": "2.3.2",

diff --git a/versions/l-/libgcrypt.json b/versions/l-/libgcrypt.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e850fdb19fd41c8270ea52dfa3dbe346b23e25f5",
+      "version": "1.9.4",
+      "port-version": 1
+    },
     {
       "git-tree": "7b99b42dfc0f469a13d4e39d9802012b9a7e78d1",
       "version": "1.9.4",