On Nov 2, 2007, at 10:30 AM, Mike Hommey wrote:
On Fri, Nov 02, 2007 at 02:03:52AM -0700, Junio C Hamano <gitster@xxxxxxxxx> wrote:Blake Ramsdell <blaker@xxxxxxxxx> writes:Signed-off-by: Blake Ramsdell <blaker@xxxxxxxxx> --- Makefile | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 71479a2..5d83756 100644 --- a/Makefile +++ b/Makefile @@ -401,7 +401,9 @@ endif ifeq ($(uname_S),Darwin) NEEDS_SSL_WITH_CRYPTO = YesPlease NEEDS_LIBICONV = YesPlease - OLD_ICONV = UnfortunatelyYes + ifneq ($(uname_R),9.0.0) + OLD_ICONV = UnfortunatelyYes + endif NO_STRLCPY = YesPlease NO_MEMMEM = YesPlease endifI do not have an access to a Darwin box, but do you mean 10.5 gives 9.0.0 as uname_R?Be it that or not, it looks wrong to me to check the Darwin version toknow what to use. Do you rely on the Linux kernel version to know whethericonv is present ?
It's very different, on OSX you don't change your own kernel as you want, the kernel isn't a standalone component, it comes packaged with the entire system of MacOSX. When you do an update to 10.5 (aka Leopard) you will have a new version of iconv so you're guaranteed that someone with 10.5 has a system-wide iconv that is not OLD_ICONV.
-- Benoit Sigoure aka Tsuna EPITA Research and Development Laboratory
Attachment:
PGP.sig
Description: This is a digitally signed message part
