Skip to content

Conversation

@dscho
Copy link
Member

@dscho dscho commented Nov 17, 2025

This was needed to be able to pass the CI builds of Git for Windows v2.52. With all the Windows build problems observed in the win+Meson job in seen lately, it might become unsustainable to also keep taking care of the CMake definition. But then, the same might be said about the Windows part of the Meson build definition.

In the `en/make-libgit-a` topic branch, more precisely in the commits
f3b4c89 (make: delete REFTABLE_LIB, add reftable to LIB_OBJS,
2025-10-02) and cf680cd (make: delete XDIFF_LIB, add xdiff to
LIB_OBJS, 2025-10-02), the strategy to build three static libraries was
rethought, and instead only one static library is now built.

This is good.

However, the CMake definition was not changed accordingly, and now
CMake-based builds fail thusly:

  [...]
  Generating hook-list.h
  CMake Error at CMakeLists.txt:122 (string):
    string sub-command REPLACE requires at least four arguments.
  Call Stack (most recent call first):
    CMakeLists.txt:711 (parse_makefile_for_sources)

  CMake Error at CMakeLists.txt:122 (string):
    string sub-command REPLACE requires at least four arguments.
  Call Stack (most recent call first):
    CMakeLists.txt:717 (parse_makefile_for_sources)

  -- Configuring incomplete, errors occurred!

Fix that by removing the parts that expect the reftable and xdiff
objects to be defined separately in the Makefile, still.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho dscho self-assigned this Nov 17, 2025
@dscho
Copy link
Member Author

dscho commented Nov 17, 2025

/submit

@gitgitgadget
Copy link

gitgitgadget bot commented Nov 17, 2025

Submitted as pull.2006.git.1763412008722.gitgitgadget@gmail.com

To fetch this version into FETCH_HEAD:

git fetch https://github.com/gitgitgadget/git/ pr-2006/dscho/adjust-cmake-to-xdiff-and-reftable-merge-into-libgit-v1

To fetch this version to local tag pr-2006/dscho/adjust-cmake-to-xdiff-and-reftable-merge-into-libgit-v1:

git fetch --no-tags https://github.com/gitgitgadget/git/ tag pr-2006/dscho/adjust-cmake-to-xdiff-and-reftable-merge-into-libgit-v1

@gitgitgadget
Copy link

gitgitgadget bot commented Nov 17, 2025

This patch series was integrated into seen via git@fc15471.

@gitgitgadget gitgitgadget bot added the seen label Nov 17, 2025
@gitgitgadget
Copy link

gitgitgadget bot commented Nov 18, 2025

This patch series was integrated into seen via git@1238422.

@gitgitgadget
Copy link

gitgitgadget bot commented Nov 18, 2025

This branch is now known as js/cmake-libgit-fix.

@gitgitgadget
Copy link

gitgitgadget bot commented Nov 18, 2025

This patch series was integrated into seen via git@813b85e.

@gitgitgadget
Copy link

gitgitgadget bot commented Nov 19, 2025

This patch series was integrated into seen via git@77cffa3.

@gitgitgadget
Copy link

gitgitgadget bot commented Nov 19, 2025

This patch series was integrated into next via git@1593640.

@gitgitgadget gitgitgadget bot added the next label Nov 19, 2025
@gitgitgadget
Copy link

gitgitgadget bot commented Nov 20, 2025

There was a status update in the "New Topics" section about the branch js/cmake-libgit-fix on the Git mailing list:

Makefile based build have recently been updated to build a
libgit.a that also has reftable and xdiff objects; CMake based
build procedure has been updated to match.

Will merge to 'master'.
source: <pull.2006.git.1763412008722.gitgitgadget@gmail.com>

@gitgitgadget
Copy link

gitgitgadget bot commented Nov 20, 2025

This patch series was integrated into seen via git@b6d7022.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant