[PATCH] Makefile: Disable gettext in the Git submodule

[PATCH] Makefile: Disable gettext in the Git submodule

[cgit]

Newer libgit versions depend on the libintl library. However, we
currently do not link against libintl which breaks compilation under
OpenBSD:

    git/libgit.a(commit.o)(.text+0x1d1b): In function `lookup_commit_or_die':
    git/gettext.h:47: undefined reference to `libintl_gettext'
    [...]

Since we do not support i18n in cgit, just disable gettext in the Git
submodule to fix this.

Signed-off-by: Lukas Fleischer <cgit at cryptocrack.de>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 76f6fe7..a9aa94a 100644
--- a/Makefile
+++ b/Makefile
@@ -99,7 +99,7 @@ ifeq ($(uname_S),$(filter $(uname_S),FreeBSD OpenBSD))
 	NEEDS_LIBICONV = yes
 endif
 
-GIT_OPTIONS = prefix=/usr
+GIT_OPTIONS = prefix=/usr NO_GETTEXT=1
 OBJECTS =
 
 ifdef NO_ICONV
-- 
1.8.2.rc0.247.g811e0c0

[PATCH] Makefile: Disable gettext in the Git submodule

[Jason]

On Mon, Mar 4, 2013 at 3:18 AM, Lukas Fleischer <cgit at cryptocrack.de> wrote:
> Since we do not support i18n in cgit, just disable gettext in the Git
> submodule to fix this.

And afaik, we don't have a reason to support i18n within git itself,
since we're not relying on its strings for external display. Merged.

[PATCH] Makefile: Disable gettext in the Git submodule

[Jason]

Hi Lukas,

A user on IRC reported that his prior trick of passing NO_ICONV to
make didn't cut it, and that now he had to pass in NO_GETTEXT. It
seems that in the Makefile reworking this commit somehow got
overwritten. Is globally disabling gettext/iconv something we still
want to do Something to consider as well -- we seem to use ICONV in
parsing.c. What's your assessment?

Thanks,
Jason