[PATCH] Clean up the SunOS Makefile rule

Peter Eriksen· Nov 2, 2005, 19:27 UTC · lore

Don't set a non-standard CURLDIR as default, and fix an error in Solaris 10 by setting NEEDS_LIBICONV.

---

I hope this is ok, since I was the one suggesting the stupid non-standard /opt/sfw path in the first place. Further more Solaris 10 seems to need NEEDS_LIBICONV.

I hope other people who know more about Solaris than me could point out, what will work on any Solaris system and not just the specific one I'm using.

Regards,

Peter
 
 Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

applies-to: b774cd64105bda561bba3c528a7fea19b87755a1 5f5bb71e10f8f3e92df2475a456d73d5ee7ca55a

Show changes to Makefile +1 −1

diff --git a/Makefile b/Makefile
index 357cb3e..cdd19c3 100644
--- a/Makefile
+++ b/Makefile
@@ -189,9 +189,9 @@ endif
 ifeq ($(uname_S),SunOS)
 	NEEDS_SOCKET = YesPlease
 	NEEDS_NSL = YesPlease
+	NEEDS_LIBICONV = YesPlease
 	SHELL_PATH = /bin/bash
 	NO_STRCASESTR = YesPlease
-	CURLDIR = /opt/sfw
 	INSTALL = ginstall
 	TAR = gtar
 	PLATFORM_DEFINES += -D__EXTENSIONS__
---
0.99.9.GIT

Peter Eriksen· Nov 2, 2005, 19:49 UTC · re: Peter Eriksen · lore

Re: [PATCH] Clean up the SunOS Makefile rule

On Wed, Nov 02, 2005 at 08:27:31PM +0100, Peter Eriksen wrote:

> Don't set a non-standard CURLDIR as default, and fix an error
> in Solaris 10 by setting NEEDS_LIBICONV.

Ups, I forgot to say, that this is

Signed-off-by: Peter Eriksen <s022018@student.dtu.dk>

Regards,

Peter

Junio C Hamano· Nov 2, 2005, 20:56 UTC · re: Peter Eriksen · lore

Re: [PATCH] Clean up the SunOS Makefile rule

"Peter Eriksen" <s022018@student.dtu.dk> writes:

> Don't set a non-standard CURLDIR as default, and fix an error
> in Solaris 10 by setting NEEDS_LIBICONV.

Just to make it clear to everybody, these platform defines are just to give default that is intended to help majority of the users. You do not have to cover everybody on that platform. Giving *one* default CURLDIR, as long as it helps major portion of the user base, would be helpful. In other words, it is OK as long as the user can say:

	solaris$ gmake CURLDIR=/I/have/my/curl/here

to override what you chose, and /opt/sfw/ is where *many* (if not most) of the Solaris installations have curl. I do not have access to many different flavours of Solaris boxes, but one machine I have at work (5.9) seems to have it installed there.

Could Solaris users on the list help us out, as Peter asks? How many of you have curl in /opt/sfw? How many others have curl in somewhere else and think that somewhere else would be more appropriate default? If this user poll results in either a default location better than /opt/sfw, or diverse locations with no clear majority, then it would make sense to remove the current default, but otherwise I would say we do not need to drop it.

People who built curl library and installed at random places themselves do not count -- they know what they are doing and are perfectly capable of overriding whatever we say in our Makefile from the comand line.

Although I think always requiring LIBICONV is OK there, and it probably is needed on *all* Solaris boxes, but in principle, NEEDS_LIBICONV is similar. If the user cannot say:

	solaris$ gmake NEEDS_LIBICONV= ;# No thanks, on my Solaris

to disable -liconv, and if some Solaris installations do not want -liconv, then that is a problem. But GNU make seems to do the right thing; ifdef NEEDS_LIBICONV seems to evaluate to false if your user overrides it to be empty from the command line.

patchClean up the SunOS Makefile rule