Re: [PATCH] Mac OS X 10.5 does not require the OLD_ICONV flag set

Blake Ramsdell [off-list ref] writes:

I do not have an access to a Darwin box, but do you mean 10.5
gives 9.0.0 as uname_R?

On 11/2/07, Junio C Hamano [off-list ref] wrote:

I do not have an access to a Darwin box, but do you mean 10.5
gives 9.0.0 as uname_R?

Yeah, apparently that's how they roll.

~/Source/OpenSource/git$ uname -r
9.0.0
~/Source/OpenSource/git$ system_profiler SPSoftwareDataType
Software:

    System Software Overview:

      System Version: Mac OS X 10.5 (9A581)
      Kernel Version: Darwin 9.0.0

Blake
-- 
Blake Ramsdell | http://www.blakeramsdell.com

On Fri, Nov 02, 2007 at 02:03:52AM -0700, Junio C Hamano [off-list ref] wrote:

Blake Ramsdell [off-list ref] writes:

quoted

Signed-off-by: Blake Ramsdell <redacted>
---
 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
 endif

I 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 to
know what to use. Do you rely on the Linux kernel version to know whether
iconv is present ?

Mike

On Nov 2, 2007, at 10:30 AM, Mike Hommey wrote:

On Fri, Nov 02, 2007 at 02:03:52AM -0700, Junio C Hamano  
[off-list ref] wrote:

quoted

Blake Ramsdell [off-list ref] writes:

quoted

Signed-off-by: Blake Ramsdell <redacted>
---
 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
 endif

I 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 to
know what to use. Do you rely on the Linux kernel version to know  
whether
iconv 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

On Fri, Nov 02, 2007 at 10:39:35AM +0100, Benoit SIGOURE [off-list ref] wrote:

On Nov 2, 2007, at 10:30 AM, Mike Hommey wrote:

quoted

On Fri, Nov 02, 2007 at 02:03:52AM -0700, Junio C Hamano  
[off-list ref] wrote:

quoted

Blake Ramsdell [off-list ref] writes:

quoted

Signed-off-by: Blake Ramsdell <redacted>
---
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
endif

I 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 to
know what to use. Do you rely on the Linux kernel version to know  
whether
iconv 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.

The fact is you can also use Darwin without OSX...

Mike

On 11/2/07, Junio C Hamano [off-list ref] wrote:

Blake Ramsdell [off-list ref] writes:

quoted

Signed-off-by: Blake Ramsdell <redacted>
---
 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
 endif

I do not have an access to a Darwin box, but do you mean 10.5
gives 9.0.0 as uname_R?

Further, that comparison is going to fail as soon as the next revision
of Darwin (9.0.1, etc.) is released.


Dave.