git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v2 1/7] fixup! Provide zlib's uncompress2 from compat/zlib-compat.c

From
Carlo Marcelo Arenas Belón <carenas@gmail.com>
Date
Aug 16, 2021, 01:15 UTC
Message-ID
<20210816011538.34199-2-carenas@gmail.com>
In-Reply-To
<20210816011538.34199-1-carenas@gmail.com>

124b6e20ef (Provide zlib's uncompress2 from compat/zlib-compat.c, 2021-07-20) adds a compatibility replacement function for uncompress2 that could be used for building with zlib < 1.2.9, but adds it to libgit.

this could result in link failures depending on the library order used by the link command as shown in (from the 32bit linux CI task for the seen branch):

  reftable/libreftable.a(block.o): In function `block_reader_init':
  /__w/git/git/reftable/block.c:222: undefined reference to `uncompress2'
  collect2: error: ld returned 1 exit status
  Makefile:2649: recipe for target 'git-daemon' failed
add it instead to the libreftable library that is also the current user.
Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 6014f74a1b..b4f5cc6fc0 100644
--- a/Makefile
+++ b/Makefile
@@ -1739,7 +1739,7 @@ endif
 
 ifdef NO_UNCOMPRESS2
 	BASIC_CFLAGS += -DNO_UNCOMPRESS2
-	LIB_OBJS += compat/zlib-uncompress2.o
+	REFTABLE_OBJS += compat/zlib-uncompress2.o
 endif
 
 ifdef NO_POSIX_GOODIES
-- 
2.33.0.rc2.476.g1b09a32a73
Previous: Carlo Marcelo Arenas BelónNext: Carlo Marcelo Arenas Belón
Message 8 of 14 in “hn/reftable "fixes" for OpenBSD”
  1. 0/3 hn/reftable "fixes" for OpenBSDCarlo Marcelo Arenas Belón, Aug 2, 2021
  2. 1/3 fixup! Provide zlib's uncompress2 from compat/zlib-compat.cCarlo Marcelo Arenas Belón, Aug 2, 2021
  3. 2/3 reftable: clarify zlib version dependencyCarlo Marcelo Arenas Belón, Aug 2, 2021
  4. 3/3 openbsd: allow reftable building with zlib 1.2.3Carlo Marcelo Arenas Belón, Aug 2, 2021
  5. 4/3 fixup! reftable: add dump utilityCarlo Marcelo Arenas Belón, Aug 4, 2021
  6. Junio C HamanoAug 4, 2021
  7. 0/7 hn/reftable "fixes" for BSDCarlo Marcelo Arenas Belón, Aug 16, 2021
  8. 1/7 fixup! Provide zlib's uncompress2 from compat/zlib-compat.cCarlo Marcelo Arenas Belón, Aug 16, 2021
  9. 2/7 reftable: clarify zlib version dependencyCarlo Marcelo Arenas Belón, Aug 16, 2021
  10. 3/7 openbsd: allow reftable building with zlib 1.2.3Carlo Marcelo Arenas Belón, Aug 16, 2021
  11. 4/7 fixup! reftable: add dump utilityCarlo Marcelo Arenas Belón, Aug 16, 2021
  12. 5/7 fixup! Provide zlib's uncompress2 from compat/zlib-compat.cCarlo Marcelo Arenas Belón, Aug 16, 2021
  13. 6/7 fixup! reftable: reftable file level testsCarlo Marcelo Arenas Belón, Aug 16, 2021
  14. 7/7 fixup! reftable: (de)serialization for the polymorphic record typeCarlo Marcelo Arenas Belón, Aug 16, 2021

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.