From: "Ezekiel Newren via GitGitGadget" <gitgitgadget@gmail•com>
To: git@vger•kernel.org
Cc: Ezekiel Newren <ezekielnewren@gmail•com>,
Ezekiel Newren <ezekielnewren@gmail•com>
Subject: [PATCH 2/3] make: delete XDIFF_LIB, add xdiff to LIB_OBJS
Date: Wed, 01 Oct 2025 18:02:27 +0000 [thread overview]
Message-ID: <28e7fd27b632eeb681e7b9af4de2d18cd327be2a.1759341748.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.2065.git.git.1759341748.gitgitgadget@gmail.com>
From: Ezekiel Newren <ezekielnewren@gmail•com>
In a future patch series the 'xdiff' Rust crate will be added. Delete
the creation of the static library file for xdiff to avoid a name
conflict. This also moves toward the goal of Rust only needing to link
against libgit.a.
Changes to Meson are not required as the xdiff library is already
included in Meson's libgit.a.
Signed-off-by: Ezekiel Newren <ezekielnewren@gmail•com>
---
Makefile | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)
diff --git a/Makefile b/Makefile
index e8fad803be..d89ba03286 100644
--- a/Makefile
+++ b/Makefile
@@ -918,7 +918,6 @@ export PYTHON_PATH
TEST_SHELL_PATH = $(SHELL_PATH)
LIB_FILE = libgit.a
-XDIFF_LIB = xdiff/lib.a
REFTABLE_LIB = reftable/libreftable.a
GENERATED_H += command-list.h
@@ -1397,8 +1396,7 @@ XDIFF_OBJS += xdiff/xmerge.o
XDIFF_OBJS += xdiff/xpatience.o
XDIFF_OBJS += xdiff/xprepare.o
XDIFF_OBJS += xdiff/xutils.o
-.PHONY: xdiff-objs
-xdiff-objs: $(XDIFF_OBJS)
+LIB_OBJS += $(XDIFF_OBJS)
REFTABLE_OBJS += reftable/basics.o
REFTABLE_OBJS += reftable/error.o
@@ -1414,8 +1412,8 @@ REFTABLE_OBJS += reftable/table.o
REFTABLE_OBJS += reftable/tree.o
REFTABLE_OBJS += reftable/writer.o
-# xdiff and reftable libs may in turn depend on what is in libgit.a
-GITLIBS = common-main.o $(LIB_FILE) $(XDIFF_LIB) $(REFTABLE_LIB) $(LIB_FILE)
+# reftable lib may in turn depend on what is in libgit.a
+GITLIBS = common-main.o $(LIB_FILE) $(REFTABLE_LIB) $(LIB_FILE)
EXTLIBS =
GIT_USER_AGENT = git/$(GIT_VERSION)
@@ -2767,7 +2765,6 @@ OBJECTS += $(GIT_OBJS)
OBJECTS += $(SCALAR_OBJS)
OBJECTS += $(PROGRAM_OBJS)
OBJECTS += $(TEST_OBJS)
-OBJECTS += $(XDIFF_OBJS)
OBJECTS += $(FUZZ_OBJS)
OBJECTS += $(REFTABLE_OBJS) $(REFTABLE_TEST_OBJS)
OBJECTS += $(UNIT_TEST_OBJS)
@@ -2921,9 +2918,6 @@ scalar$X: scalar.o GIT-LDFLAGS $(GITLIBS)
$(LIB_FILE): $(LIB_OBJS)
$(QUIET_AR)$(RM) $@ && $(AR) $(ARFLAGS) $@ $^
-$(XDIFF_LIB): $(XDIFF_OBJS)
- $(QUIET_AR)$(RM) $@ && $(AR) $(ARFLAGS) $@ $^
-
$(REFTABLE_LIB): $(REFTABLE_OBJS)
$(QUIET_AR)$(RM) $@ && $(AR) $(ARFLAGS) $@ $^
@@ -3765,7 +3759,7 @@ clean: profile-clean coverage-clean cocciclean
$(RM) git.rc git.res
$(RM) $(OBJECTS)
$(RM) headless-git.o
- $(RM) $(LIB_FILE) $(XDIFF_LIB) $(REFTABLE_LIB)
+ $(RM) $(LIB_FILE) $(REFTABLE_LIB)
$(RM) $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS) $(OTHER_PROGRAMS)
$(RM) $(TEST_PROGRAMS)
$(RM) $(FUZZ_PROGRAMS)
@@ -3959,7 +3953,6 @@ endif
LIBGIT_PUB_OBJS += contrib/libgit-sys/public_symbol_export.o
LIBGIT_PUB_OBJS += libgit.a
LIBGIT_PUB_OBJS += reftable/libreftable.a
-LIBGIT_PUB_OBJS += xdiff/lib.a
LIBGIT_PARTIAL_EXPORT = contrib/libgit-sys/partial_symbol_export.o
--
gitgitgadget
next prev parent reply other threads:[~2025-10-01 18:02 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-10-01 18:02 [PATCH 0/3] Makefile update libgit.a: Include xdiff and reftable in libgit.a Ezekiel Newren via GitGitGadget
2025-10-01 18:02 ` [PATCH 1/3] make: move xdiff and reftable objects before GITLIBS Ezekiel Newren via GitGitGadget
2025-10-01 18:02 ` Ezekiel Newren via GitGitGadget [this message]
2025-10-02 5:47 ` [PATCH 2/3] make: delete XDIFF_LIB, add xdiff to LIB_OBJS Patrick Steinhardt
2025-10-02 13:31 ` Junio C Hamano
2025-10-02 15:33 ` Patrick Steinhardt
2025-10-02 18:50 ` Ezekiel Newren
2025-10-02 19:01 ` Junio C Hamano
2025-10-02 19:18 ` Ezekiel Newren
2025-10-02 18:53 ` Ezekiel Newren
2025-10-01 18:02 ` [PATCH 3/3] make: delete REFTABLE_LIB, add reftable " Ezekiel Newren via GitGitGadget
2025-10-02 5:49 ` Patrick Steinhardt
2025-10-02 13:32 ` Junio C Hamano
2025-10-02 18:57 ` Ezekiel Newren
2025-10-01 23:32 ` [PATCH 0/3] Makefile update libgit.a: Include xdiff and reftable in libgit.a Junio C Hamano
2025-10-02 19:17 ` Ezekiel Newren
2025-10-02 21:02 ` Junio C Hamano
2025-10-02 23:03 ` Ezekiel Newren
2025-10-02 23:27 ` [PATCH v2 0/2] " Ezekiel Newren via GitGitGadget
2025-10-02 23:27 ` [PATCH v2 1/2] make: delete XDIFF_LIB, add xdiff to LIB_OBJS Ezekiel Newren via GitGitGadget
2025-10-02 23:27 ` [PATCH v2 2/2] make: delete REFTABLE_LIB, add reftable " Ezekiel Newren via GitGitGadget
2025-10-03 16:43 ` [PATCH v2 0/2] Makefile update libgit.a: Include xdiff and reftable in libgit.a Junio C Hamano
2025-10-08 7:22 ` Patrick Steinhardt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=28e7fd27b632eeb681e7b9af4de2d18cd327be2a.1759341748.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail$(echo .)com \
--cc=ezekielnewren@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox