threads / patch / 1741

patchAdd $(LIBS) and set libiconv in tools/Makefile for Darwin

Subject: [PATCH] Add $(LIBS) and set libiconv in tools/Makefile for Darwin

## tl;dr

4 messages between Sep 7, 2005 and Sep 7, 2005. Diffs are folded; open one to read it.

replies: 3people: 2as markdown or json

Mark Allen· Sep 7, 2005, 03:08 UTC · lore

[PATCH] Add $(LIBS) and set libiconv in tools/Makefile for Darwin

This trivial patch creates $(LIBS) and sets it to iconv in tools/Makefile because MacOS 10.4 [gcc 4.0] gets cranky about libiconv routines referenced in mailinfo.c (convert_to_utf8) and no library pointer to link the symbols against.

I haven't tested this on Linux yet (but I will tomorrow when I get into work).

Signed-off-by: Mark Allen <mrallen1@yahoo.com>

[PATCH] Add LIBS field and populate with iconv to tools/Makefile for Darwin

OS X.4 [gcc 4.0] gets cranky about iconv data structures and no library pointer to link the symbols against.

Signed-off-by: Mark Allen <mrallen1@yahoo.com>
---

 tools/Makefile |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

44865be29a83e2b4b0bf65c6dae427203b7be9b9

Show changes to tools/Makefile +2 −1

diff --git a/tools/Makefile b/tools/Makefile
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -7,13 +7,14 @@ ALL_CFLAGS = $(CFLAGS)
 INSTALL=install
 prefix=$(HOME)
 bindir=$(prefix)/bin
+LIBS=iconv
 # DESTDIR=
 
 PROGRAMS=git-mailsplit git-mailinfo
 SCRIPTS=git-applymbox git-applypatch
 
 git-%: %.c
-	$(CC) $(ALL_CFLAGS) -o $@ $(filter %.c,$^)
+	$(CC) $(ALL_CFLAGS) -l$(LIBS) -o $@ $(filter %.c,$^)
 
 all: $(PROGRAMS)

Junio C Hamano· Sep 7, 2005, 05:47 UTC · re: Mark Allen · lore

Re: [PATCH] Add $(LIBS) and set libiconv in tools/Makefile for Darwin

Mark Allen <mrallen1@yahoo.com> writes:

> This trivial patch creates $(LIBS) and sets it to iconv in
> tools/Makefile because MacOS 10.4 [gcc 4.0] gets cranky about
> libiconv routines referenced in mailinfo.c (convert_to_utf8)
> and no library pointer to link the symbols against.

I'd do this slightly differently. Could you take a look at what I have in the "proposed updates" branch, especially "Flatten tools/ directory" commit? What I am aiming for is to have platform specific ifeq() thing in only one place.

Mark Allen· Sep 7, 2005, 15:01 UTC · re: Junio C Hamano · lore

Re: [PATCH] Add $(LIBS) and set libiconv in tools/Makefile for Darwin

--- Junio C Hamano <junkio@cox.net> wrote:

> I'd do this slightly differently.  Could you take a look at what
> I have in the "proposed updates" branch, especially "Flatten
> tools/ directory" commit?  What I am aiming for is to have
> platform specific ifeq() thing in only one place.

Looks good to me, Junio.  There's a very small typo in your commit though. :-)

Cheers,

--Mark

---

Show changes to Makefile +1 −1

diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -149,7 +149,7 @@ else
        MOZILLA_SHA1=1
        OPENSSL_LIBSSL=
 endif
-ifdef NEEDS_SSL_WITH_CRIPTO
+ifdef NEEDS_SSL_WITH_CRYPTO
        LIB_4_CRYPTO = -lcrypto -lssl
 else
        LIB_4_CRYPTO = -lcrypto

Junio C Hamano· Sep 7, 2005, 19:18 UTC · re: Mark Allen · lore

Re: [PATCH] Add $(LIBS) and set libiconv in tools/Makefile for Darwin

Mark Allen <mrallen1@yahoo.com> writes:

> Looks good to me, Junio.  There's a very small typo in your
> commit though. :-)

Thanks.