about summary refs log tree commit diff
diff options
context:
space:
mode:
authorLukas Fleischer <cgit@cryptocrack.de>2013-03-04 09:18:38 +0100
committerJason A. Donenfeld <Jason@zx2c4.com>2013-03-04 09:27:43 -0500
commit78a24e5c55ac57efab90cf1e65b9af226b388a39 (patch)
tree60313e5eda3dc83f98ea15128c86cc3a5b50c60a
parentMakefile: improve dependency generation (diff)
downloadcgit-pink-78a24e5c55ac57efab90cf1e65b9af226b388a39.tar.gz
cgit-pink-78a24e5c55ac57efab90cf1e65b9af226b388a39.zip
Makefile: Disable gettext in the Git submodule
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@cryptocrack.de>
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 42e8bfd..1127961 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
s Hjemli 2009-07-25cgitrc.5.txt: document 'embedded' and 'noheader'Lars Hjemli 2009-07-25Add support for 'noheader' optionLars Hjemli 2009-07-25cgitrc.5.txt: document 'head-include'Lars Hjemli 2009-07-25ui-blob: return 'application/octet-stream' for binary blobsLars Hjemli 2009-07-25ui-plain: Return 'application/octet-stream' for binary files.Remko Tronçon 2009-06-11use cgit_httpscheme() for atom feedDiego Ongaro 2009-06-11add cgit_httpscheme() -> http:// or https://Diego Ongaro 2009-06-07Return http statuscode 404 on unknown branchLars Hjemli 2009-06-07Add head-include configuration option.Mark Lodato 2009-03-15CGIT 0.8.2.1Lars Hjemli 2009-03-15Fix doc-related glitches in Makefile and .gitignoreLars Hjemli 2009-03-15ui-snapshot: avoid segfault when no filename is specifiedLars Hjemli 2009-03-15fix segfault when displaying empty blobsEric Wong 2009-02-19Add support for HEAD requestsLars Hjemli 2009-02-19Add support for ETag in 'plain' viewLars Hjemli 2009-02-12ui-tree: escape ascii-text properly in hexdump viewLars Hjemli 2009-02-12Makefile: add doc-related targetsLars Hjemli