[PATCH] osxkeychain: fix build with Rust

[PATCH] osxkeychain: fix build with Rust

[Johannes Schindelin via GitGitGadget]

From: Johannes Schindelin <johannes.schindelin@gmx.de>

Without NO_RUST defined, the varint encoder/decoder lives in the
RUST_LIB, which needs to be linked. Symptom:

cc [... -o contrib/credential/osxkeychain/git-credential-osxkeychain [...]
Undefined symbols for architecture x86_64:
  "_decode_varint", referenced from:
      _read_untracked_extension in libgit.a[x86_64][63](dir.o)
      _read_untracked_extension in libgit.a[x86_64][63](dir.o)
      _read_one_dir in libgit.a[x86_64][63](dir.o)
      _read_one_dir in libgit.a[x86_64][63](dir.o)
      _load_cache_entry_block in libgit.a[x86_64][174](read-cache.o)
  "_encode_varint", referenced from:
      _write_untracked_extension in libgit.a[x86_64][63](dir.o)
      _write_untracked_extension in libgit.a[x86_64][63](dir.o)
      _write_untracked_extension in libgit.a[x86_64][63](dir.o)
      _write_one_dir in libgit.a[x86_64][63](dir.o)
      _write_one_dir in libgit.a[x86_64][63](dir.o)
      _do_write_index in libgit.a[x86_64][174](read-cache.o)
ld: symbol(s) not found for architecture x86_64

While it is curious why these functions are needed at all (osxkeychain
does not read or write the index), the compile error is a real problem.

Instead of trying to play games to add `GITLIBS` while filtering out
`common-main.o`, replace the `$(LIB_FILE) $(EXTLIBS)` construct with the
much shorter `$(LIBS)` construct that _already_ filters out
`common-main.o` and adds the Rust library when needed.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
    osxkeychain: fix build with Rust
    
    I ran into this when trying to build Microsoft Git v2.55.0-rc0. This
    seems to be similar in spirit to
    https://lore.kernel.org/git/pull.2288.git.git.1778001976709.gitgitgadget@gmail.com/
    but the latter seems not to have gained traction. This build failure is
    a hard regression in v2.55.0, though.

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-2154%2Fdscho%2Fosxkeychain-vs-rust-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-2154/dscho/osxkeychain-vs-rust-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/2154

 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 0976a69b4c..1cec251f43 100644
--- a/Makefile
+++ b/Makefile
@@ -4074,7 +4074,7 @@ contrib/libgit-sys/libgitpub.a: $(LIBGIT_HIDDEN_EXPORT)
 
 contrib/credential/osxkeychain/git-credential-osxkeychain: contrib/credential/osxkeychain/git-credential-osxkeychain.o $(LIB_FILE) GIT-LDFLAGS
 	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) \
-		$(filter %.o,$^) $(LIB_FILE) $(EXTLIBS) -framework Security -framework CoreFoundation
+		$(filter %.o,$^) $(LIBS) -framework Security -framework CoreFoundation
 
 contrib/credential/osxkeychain/git-credential-osxkeychain.o: contrib/credential/osxkeychain/git-credential-osxkeychain.c GIT-CFLAGS
 	$(QUIET_LINK)$(CC) -o $@ -c $(dep_args) $(compdb_args) $(ALL_CFLAGS) $(EXTRA_CPPFLAGS) $<

base-commit: 0fae78c9d55efe705877ea537fe42c59164ccd94
-- 
gitgitgadget

Re: [PATCH] osxkeychain: fix build with Rust

[Junio C Hamano]

"Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
writes:

> From: Johannes Schindelin <johannes.schindelin@gmx.de>
>
> Without NO_RUST defined, the varint encoder/decoder lives in the
> RUST_LIB, which needs to be linked. Symptom:
>
> cc [... -o contrib/credential/osxkeychain/git-credential-osxkeychain [...]
> Undefined symbols for architecture x86_64:
>   "_decode_varint", referenced from:
>       _read_untracked_extension in libgit.a[x86_64][63](dir.o)
>       _read_untracked_extension in libgit.a[x86_64][63](dir.o)
>       _read_one_dir in libgit.a[x86_64][63](dir.o)
>       _read_one_dir in libgit.a[x86_64][63](dir.o)
>       _load_cache_entry_block in libgit.a[x86_64][174](read-cache.o)
>   "_encode_varint", referenced from:
>       _write_untracked_extension in libgit.a[x86_64][63](dir.o)
>       _write_untracked_extension in libgit.a[x86_64][63](dir.o)
>       _write_untracked_extension in libgit.a[x86_64][63](dir.o)
>       _write_one_dir in libgit.a[x86_64][63](dir.o)
>       _write_one_dir in libgit.a[x86_64][63](dir.o)
>       _do_write_index in libgit.a[x86_64][174](read-cache.o)
> ld: symbol(s) not found for architecture x86_64
>
> While it is curious why these functions are needed at all (osxkeychain
> does not read or write the index), the compile error is a real problem.
>
> Instead of trying to play games to add `GITLIBS` while filtering out
> `common-main.o`, replace the `$(LIB_FILE) $(EXTLIBS)` construct with the
> much shorter `$(LIBS)` construct that _already_ filters out
> `common-main.o` and adds the Rust library when needed.
>
> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> ---

Hmph, we do not build this at GitHub Actions based CI?  Just being
curious.

Let me take this directly to 'master' before tagging -rc1.  Thanks.

>     osxkeychain: fix build with Rust