git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Wincent Colaiuta <win@wincent.com>
To: git@vger.kernel.org
Cc: jnareb@gmail.com, blaker@gmail.com, Wincent Colaiuta <win@wincent.com>
Subject: [PATCH] Silence iconv warnings on Leopard
Date: Thu,  6 Dec 2007 20:07:03 +0100	[thread overview]
Message-ID: <1196968023-45284-1-git-send-email-win@wincent.com> (raw)

Apple ships a newer version of iconv with Leopard (Mac OS X 10.5/Darwin
9). Ensure that OLD_ICONV is not set on any version of Darwin in the
9.x series; this should be good for at least a couple of years, when
Darwin 10 comes out and we can invert the sense of the test to
specifically check for Darwin 7 or 8.

A more sophisticated and robust check is possible for those who use
autoconf, but not everybody does that.

Signed-off-by: Wincent Colaiuta <win@wincent.com>
---
 Makefile |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/Makefile b/Makefile
index 999391e..4dda340 100644
--- a/Makefile
+++ b/Makefile
@@ -406,7 +406,9 @@ endif
 ifeq ($(uname_S),Darwin)
 	NEEDS_SSL_WITH_CRYPTO = YesPlease
 	NEEDS_LIBICONV = YesPlease
-	OLD_ICONV = UnfortunatelyYes
+	ifneq ($(shell expr "$(uname_R)" : '9\.'),2)
+		OLD_ICONV = UnfortunatelyYes
+	endif
 	NO_STRLCPY = YesPlease
 	NO_MEMMEM = YesPlease
 endif
-- 
1.5.3.7.1067.gaa51

             reply	other threads:[~2007-12-06 19:09 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-12-06 19:07 Wincent Colaiuta [this message]
2007-12-06 23:04 ` [PATCH] Silence iconv warnings on Leopard Blake Ramsdell
2007-12-07  0:11   ` Jakub Narebski
2007-12-07  0:12     ` Blake Ramsdell
2007-12-07  0:30     ` Linus Torvalds
2007-12-07  0:41       ` Blake Ramsdell
2007-12-07  0:44         ` Blake Ramsdell
2007-12-07  1:27       ` [PATCH/RFC (take 3)] autoconf: Add test for OLD_ICONV (squelching compiler warning) Jakub Narebski
2007-12-07  7:26         ` Junio C Hamano
2007-12-07  8:25           ` Wincent Colaiuta
2007-12-07  8:22         ` Wincent Colaiuta
2007-12-07  8:29         ` Blake Ramsdell

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=1196968023-45284-1-git-send-email-win@wincent.com \
    --to=win@wincent.com \
    --cc=blaker@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=jnareb@gmail.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).