Merge branch 'master' into ospath

This commit is contained in:
Joey Hess 2025-01-29 18:48:02 -04:00
commit 97c83152d6
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
4 changed files with 23 additions and 19 deletions

View file

@ -333,12 +333,14 @@ Executable git-annex
P2P.Http.State
if flag(OsPath)
Build-Depends:
os-string (>= 2.0.0),
directory (>= 1.3.8.3),
filepath (>= 1.5.2.0),
file-io (>= 0.1.3)
CPP-Options: -DWITH_OSPATH
-- Currently this build flag does not pass the test suite on Windows
if (! os(windows))
Build-Depends:
os-string (>= 2.0.0),
directory (>= 1.3.8.3),
filepath (>= 1.5.2.0),
file-io (>= 0.1.3)
CPP-Options: -DWITH_OSPATH
if (os(windows))
Build-Depends: