Skip to content

Conversation

afarber
Copy link
Contributor

@afarber afarber commented Sep 12, 2025

Fix #7238 by:

  • Upgrade fmt dependency from 10.2.1 to 11.2.0 using git rm -r third_party/fmt && git subtree add --prefix=third_party/fmt https://github.com/fmtlib/fmt.git 11.2.0 --squash to preserve the upstream git log. This is necessary, because the upstream fmt project has switched from using a branch (like 10.x) to using tags on the master branch and thus git subtree pull would not work
  • Add /utf-8 flag for MSVC to satisfy fmt 11.2.0 Unicode requirement
  • Update obsolete link in scripts/update_dependencies.sh comment
  • Ignore .gradle folder

Tasklist

Requirements / Relations

Link any requirements here. Other pull requests this PR is based on?

git-subtree-dir: third_party/fmt
git-subtree-split: 40626af88bd7df9a5fb80be7b25ac85b122d6c21
@afarber
Copy link
Contributor Author

afarber commented Sep 14, 2025

Hi @DennisOSRM and @SiarheiFedartsou please review my PR.

Naturally it modifies many files.

You can verify, that I have not introduced any "trojan horses" by running:

git clone --depth 1 --branch 11.2.0 https://github.com/fmtlib/fmt.git /tmp/fmt-official

for dir in include src CMakeLists.txt; do
  echo "=== Comparing $dir ==="
  diff -r "third_party/fmt/$dir" "/tmp/fmt-official/$dir" \
    --exclude='*.o' --exclude='*.so' --exclude='CMakeFiles' \
    --exclude='*.cmake' --exclude='Makefile' 2>/dev/null || echo "No differences"
done

@DennisOSRM
Copy link
Collaborator

Thanks for the ping. Will need a day or two before I can get to the review

@afarber
Copy link
Contributor Author

afarber commented Sep 23, 2025

Hi @DennisOSRM and @SiarheiFedartsou please consider merging the PR

@afarber
Copy link
Contributor Author

afarber commented Sep 24, 2025

Hi @DennisOSRM I have resolved the conflicting lines in the CHANGELOG.md, please try to merge

@DennisOSRM DennisOSRM merged commit 1ba78bf into Project-OSRM:master Sep 24, 2025
21 checks passed
@afarber afarber deleted the 7238-upgrade-fmt branch September 24, 2025 09:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Upgrade fmt from 10.2.1 to 11.2.0
2 participants