All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Carlo Marcelo Arenas Belón" <carenas@gmail.com>
To: git@vger.kernel.org
Cc: hanwen@google.com, gitster@pobox.com,
	"Carlo Marcelo Arenas Belón" <carenas@gmail.com>
Subject: [PATCH v2 1/7] fixup! Provide zlib's uncompress2 from compat/zlib-compat.c
Date: Sun, 15 Aug 2021 18:15:32 -0700	[thread overview]
Message-ID: <20210816011538.34199-2-carenas@gmail.com> (raw)
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


  reply	other threads:[~2021-08-16  1:15 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-02 19:00 [PATCH 0/3] hn/reftable "fixes" for OpenBSD Carlo Marcelo Arenas Belón
2021-08-02 19:00 ` [PATCH 1/3] fixup! Provide zlib's uncompress2 from compat/zlib-compat.c Carlo Marcelo Arenas Belón
2021-08-02 19:00 ` [PATCH 2/3] reftable: clarify zlib version dependency Carlo Marcelo Arenas Belón
2021-08-02 19:00 ` [PATCH 3/3] openbsd: allow reftable building with zlib 1.2.3 Carlo Marcelo Arenas Belón
2021-08-04  6:44 ` [PATCH 4/3] fixup! reftable: add dump utility Carlo Marcelo Arenas Belón
2021-08-04 17:24   ` Junio C Hamano
2021-08-16  1:15 ` [PATCH v2 0/7] hn/reftable "fixes" for BSD Carlo Marcelo Arenas Belón
2021-08-16  1:15   ` Carlo Marcelo Arenas Belón [this message]
2021-08-16  1:15   ` [PATCH v2 2/7] reftable: clarify zlib version dependency Carlo Marcelo Arenas Belón
2021-08-16  1:15   ` [PATCH v2 3/7] openbsd: allow reftable building with zlib 1.2.3 Carlo Marcelo Arenas Belón
2021-08-16  1:15   ` [PATCH v2 4/7] fixup! reftable: add dump utility Carlo Marcelo Arenas Belón
2021-08-16  1:15   ` [PATCH v2 5/7] fixup! Provide zlib's uncompress2 from compat/zlib-compat.c Carlo Marcelo Arenas Belón
2021-08-16  1:15   ` [PATCH v2 6/7] fixup! reftable: reftable file level tests Carlo Marcelo Arenas Belón
2021-08-16  1:15   ` [PATCH v2 7/7] fixup! reftable: (de)serialization for the polymorphic record type Carlo Marcelo Arenas Belón

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=20210816011538.34199-2-carenas@gmail.com \
    --to=carenas@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=hanwen@google.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.