patchMakefile: improve customization for supporting HP-UX

In 81cc66a, customization has been added to Makefile for supporting HP-UX, but two minor tweaks are still necessary, at least on older versions like 11.11.

Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
---

Cc'ing Robert, it would be interesting to know how did he succeed to build without this patch.

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

On Sat, Aug 23, 2008 at 09:41:24PM +0200, Miklos Vajna wrote:

Well, it just worked though I cannot give a guarantee that there is not a flaw somewhere in the binaries since these machines are not our main development machines and most developers use git itself on another system that shares the same network directory.

The systems I build on are:

1x HP-UX B.11.11 U 9000/785 2x HP-UX B.11.23 U ia64

If you tell us how your specific problem looks like I might have an idea why it does not occur to me.

Robert

On Sat, Aug 23, 2008 at 10:09:28PM +0200, Robert Schiele <rschiele@gmail.com> wrote:

This is the same version I'm using at the moment.

The NEEDS_LIBICONV is simple, the linker fails to find iconv symbols:

/usr/ccs/bin/ld: Unsatisfied symbols:
   libiconv (first referenced in libgit.a(utf8.o)) (code)
   libiconv_open (first referenced in libgit.a(utf8.o)) (code)
   libiconv_close (first referenced in libgit.a(utf8.o)) (code)
collect2: ld returned 1 exit status
gmake: *** [git] Error 1

The SNPRINTF_RETURNS_BOGUS is not something you can notice compile-time, but once you try to commit, you get:

$ git commit fatal: your vsnprintf is broken

On Sat, Aug 23, 2008 at 10:26:01PM +0200, Miklos Vajna wrote:

Huh? Where does the "lib" prefix come from on your system? Do you have some custom iconv header file in the way? On my system I see:

[13] % nm /usr/lib/libc.2 | grep ^iconv iconv | 1255080|extern|entry | iconv | 1255112|extern|code |$CODE$ iconv_close | 1254800|extern|entry | iconv_close | 1254832|extern|code |$CODE$ iconv_open | 1255208|extern|entry | iconv_open | 1255272|extern|code |$CODE$ [14] %

Ok, I see that as well. Obviously nobody ever committed something on these machines. But since we use these machines mostly for building people need to be able to checkout stuff only in most cases and this is most likely why it passed unnoticed.

Thus I think the snprintf part of your patch makes sense but the iconv stuff seems to be something flawed on your machine.

Robert

On Sat, Aug 23, 2008 at 11:02:43PM +0200, Robert Schiele <rschiele@gmail.com> wrote:

Ah, OK, that is specific to this machine. If you install the libiconv package, then #include <iconv.h> includes /usr/local/include/iconv.h where iconv is a define to libiconv. So that is not needed generally, thanks for pointing out.

OK, I'll send a patch with that part only in a bit.

In 81cc66a, customization has been added to Makefile for supporting HP-UX, but git commit is still problematic. This should fix the issue.

Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
---
 Makefile |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

Miklos Vajna <vmiklos@frugalware.org> writes:

Is this missing "Tested-by: Robert"? I do not mind adding it myself -- just checking.

On Sat, Aug 23, 2008 at 06:00:04PM -0700, Junio C Hamano wrote:

It is tested by me, yes. On HP-UX B.11.11 U 9000/785 and HP-UX B.11.23 U ia64.

Robert