[xapian] no absolute paths (#27497)

microsoft · Oct 31, 2022 · a17a5ca · a17a5ca
1 parent 809c4ea
commit a17a5ca
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 5 deletions.
diff --git a/ports/xapian/portfile.cmake b/ports/xapian/portfile.cmake
@@ -4,10 +4,9 @@ vcpkg_download_distfile(ARCHIVE
     SHA512 4071791daf47f5ae77f32f358c6020fcfa9aa81c15c8da25489b055eef30383695e449ab1cb73670f2f5db2b2a5f78056da0e8eea89d83aaad91dfe340a6b13a
 )
 
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH
+vcpkg_extract_source_archive(
+    SOURCE_PATH
     ARCHIVE "${ARCHIVE}"
-
 )
 
 if(WIN32)
@@ -34,5 +33,12 @@ vcpkg_install_make()
 vcpkg_fixup_pkgconfig()
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/xapian)
 
+if (NOT VCPKG_TARGET_IS_WINDOWS)
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/xapian-config" "\"${CURRENT_INSTALLED_DIR}\"" "`dirname $0`/../../..")
+    if(NOT VCPKG_BUILD_TYPE)
+        vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/xapian-config" "\"${CURRENT_INSTALLED_DIR}/debug\"" "`dirname $0`/../../../../debug")
+    endif()
+endif()
+
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 configure_file("${SOURCE_PATH}/COPYING" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY)
diff --git a/ports/xapian/vcpkg.json b/ports/xapian/vcpkg.json
@@ -1,10 +1,11 @@
 {
   "name": "xapian",
   "version": "1.4.21",
+  "port-version": 1,
   "description": "Xapian is an Open Source Search Engine Library, released under the GPL v2+. It's written in C++, with bindings to allow use from Perl, Python 2, Python 3, PHP 5, PHP 7, Java, Tcl, C#, Ruby, Lua, Erlang, Node.js and R (so far!)",
   "homepage": "https://github.com/xapian/xapian",
   "license": "GPL-2.0-or-later",
-  "supports": "!(arm | uwp)",
+  "supports": "!(windows & arm) & !uwp",
   "dependencies": [
     {
       "name": "vcpkg-cmake-config",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -8002,7 +8002,7 @@
     },
     "xapian": {
       "baseline": "1.4.21",
-      "port-version": 0
+      "port-version": 1
     },
     "xaudio2redist": {
       "baseline": "1.2.9",

diff --git a/versions/x-/xapian.json b/versions/x-/xapian.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "88d78609c12312fdd2b7260e1c4c1fb3838373b7",
+      "version": "1.4.21",
+      "port-version": 1
+    },
     {
       "git-tree": "e5f0103eea3c5622af1b593bfca64e9045c55cb5",
       "version": "1.4.21",