Git development
 help / color / mirror / Atom feed
From: "Shawn O. Pearce" <spearce@spearce.org>
To: Junio C Hamano <junkio@cox.net>
Cc: git@vger.kernel.org
Subject: [PATCH 2/3] Include -lz when linking git-daemon.
Date: Sun, 5 Nov 2006 00:36:15 -0500	[thread overview]
Message-ID: <20061105053615.GB4193@spearce.org> (raw)

Some platforms (Solaris in particular) appear to require -lz as
part of the link line for git-daemon, due to it linking against
sha1_file.o and that module requiring inflate/deflate support.

This wasn't made platform-specific in the Makefile as the existing
use of -lz in every other (non git-daemon) application is also
not platform-specific.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---
 Makefile |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/Makefile b/Makefile
index 1cc9f58..9f10054 100644
--- a/Makefile
+++ b/Makefile
@@ -317,6 +317,7 @@ BUILTIN_OBJS = \
 
 GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
 EXTLIBS = -lz
+SIMPLE_LIB = -lz
 
 #
 # Platform specific tweaks
-- 
1.4.3.3.g9621

             reply	other threads:[~2006-11-05  5:36 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-11-05  5:36 Shawn O. Pearce [this message]
2006-11-05  7:14 ` [PATCH 2/3] Include -lz when linking git-daemon Junio C Hamano
2006-11-05  7:28   ` [PATCH 2/2] Remove SIMPLE_PROGRAMS and make git-daemon a normal program Shawn O. Pearce

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=20061105053615.GB4193@spearce.org \
    --to=spearce@spearce.org \
    --cc=git@vger.kernel.org \
    --cc=junkio@cox.net \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox