Author: Lars Hjemli <hjemli@gmail.com>
Merge branch 'rj/buildtweaks' into stable
Makefile | 23 +++++++++++++++++++++++ cgit.h | 6 ------ parsing.c | 4 ++++ ui-repolist.c | 4 ++++
diff --git a/Makefile b/Makefile index 21076103395d07bcbe9f0419b8b7a190238d2cee..2e51c319c4e1830021df363ea4c9d1f4404a88d7 100644 --- a/Makefile +++ b/Makefile @@ -7,6 +7,26 @@ SHA1_HEADER =GIT_VER = 1.6.0.3 GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 +# Define NO_STRCASESTR if you don't have strcasestr. +# +# Define NEEDS_LIBICONV if linking with libc is not enough (eg. Darwin). +# + +#-include config.mak + +# +# Platform specific tweaks +# + +uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') +uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not') +uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not') + +ifeq ($(uname_O),Cygwin) + NO_STRCASESTR = YesPlease + NEEDS_LIBICONV = YesPlease +endif + # # Let the user override the above settings. # @@ -95,6 +115,9 @@ CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' ifdef NO_ICONV CFLAGS += -DNO_ICONV +endif +ifdef NO_STRCASESTR + CFLAGS += -DNO_STRCASESTR endif cgit: $(OBJECTS) libgit diff --git a/cgit.h b/cgit.h index 91db98aa900061046fa342935f78bd82a89b665b..92f0c5a27b12e6c5e41dea00872a83f20e635bac 100644 --- a/cgit.h +++ b/cgit.h @@ -233,11 +233,5 @@ extern const char *cgit_repobasename(const char *reponame); extern int cgit_parse_snapshots_mask(const char *str); -/* libgit.a either links against or compiles its own implementation of - * strcasestr(), and we'd like to reuse it. Simply re-declaring it - * seems to do the trick. - */ -extern char *strcasestr(const char *haystack, const char *needle); - #endif /* CGIT_H */ diff --git a/parsing.c b/parsing.c index c8f30482eb301ba430ec97fc42c86feb47629c53..f3f3b15f736521f267e87dd474fee0af5c961250 100644 --- a/parsing.c +++ b/parsing.c @@ -96,6 +96,9 @@ } return p; } +#ifdef NO_ICONV +#define reencode(a, b, c) +#else const char *reencode(char **txt, const char *src_enc, const char *dst_enc) { char *tmp; @@ -110,6 +113,7 @@ *txt = tmp; } return *txt; } +#endif struct commitinfo *cgit_parse_commit(struct commit *commit) { diff --git a/ui-repolist.c b/ui-repolist.c index c23232c36ac1a02194ac8b3c0c833d9e0bc18725..2324273f8df7cc0a81ee787dd707b3047a4a350a 100644 --- a/ui-repolist.c +++ b/ui-repolist.c @@ -6,6 +6,10 @@ * Licensed under GNU General Public License v2 * (see COPYING for full license text) */ +/* This is needed for strcasestr to be defined by <string.h> */ +#define _GNU_SOURCE 1 +#include <string.h> + #include <time.h> #include "cgit.h"