Unified · Split
| @@ -7,6 +7,26 @@ SHA1_HEADER = <openssl/sha.h> · 6 unmodified lines | ||
| 7 | 7 | GIT_VER = 1.6.0.3 |
| 8 | 8 | GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 |
| 9 | 9 | |
| 10 | +# Define NO_STRCASESTR if you don't have strcasestr. | |
| 11 | +# | |
| 12 | +# Define NEEDS_LIBICONV if linking with libc is not enough (eg. Darwin). | |
| 13 | +# | |
| 14 | + | |
| 15 | +#-include config.mak | |
| 16 | + | |
| 17 | +# | |
| 18 | +# Platform specific tweaks | |
| 19 | +# | |
| 20 | + | |
| 21 | +uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') | |
| 22 | +uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not') | |
| 23 | +uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not') | |
| 24 | + | |
| 25 | +ifeq ($(uname_O),Cygwin) | |
| 26 | + NO_STRCASESTR = YesPlease | |
| 27 | + NEEDS_LIBICONV = YesPlease | |
| 28 | +endif | |
| 29 | + | |
| 10 | 30 | # |
| 11 | 31 | # Let the user override the above settings. |
| 12 | 32 | # |
| @@ -96,6 +116,9 @@ CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' · 83 unmodified lines | ||
| 96 | 116 | ifdef NO_ICONV |
| 97 | 117 | CFLAGS += -DNO_ICONV |
| 98 | 118 | endif |
| 119 | +ifdef NO_STRCASESTR | |
| 120 | + CFLAGS += -DNO_STRCASESTR | |
| 121 | +endif | |
| 99 | 122 | |
| 100 | 123 | cgit: $(OBJECTS) libgit |
| 101 | 124 | $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) |
| @@ -233,11 +233,5 @@ extern const char *cgit_repobasename(const char *reponame); · 232 unmodified lines | ||
| 233 | 233 | |
| 234 | 234 | extern int cgit_parse_snapshots_mask(const char *str); |
| 235 | 235 | |
| 236 | −/* libgit.a either links against or compiles its own implementation of | |
| 237 | − * strcasestr(), and we'd like to reuse it. Simply re-declaring it | |
| 238 | − * seems to do the trick. | |
| 239 | − */ | |
| 240 | −extern char *strcasestr(const char *haystack, const char *needle); | |
| 241 | − | |
| 242 | 236 | |
| 243 | 237 | #endif /* CGIT_H */ |
| @@ -96,6 +96,9 @@ char *parse_user(char *t, char **name, char **email, unsigned long *date) · 95 unmodified lines | ||
| 96 | 96 | return p; |
| 97 | 97 | } |
| 98 | 98 | |
| 99 | +#ifdef NO_ICONV | |
| 100 | +#define reencode(a, b, c) | |
| 101 | +#else | |
| 99 | 102 | const char *reencode(char **txt, const char *src_enc, const char *dst_enc) |
| 100 | 103 | { |
| 101 | 104 | char *tmp; |
| @@ -110,6 +113,7 @@ const char *reencode(char **txt, const char *src_enc, const char *dst_enc) · 8 unmodified lines | ||
| 110 | 113 | } |
| 111 | 114 | return *txt; |
| 112 | 115 | } |
| 116 | +#endif | |
| 113 | 117 | |
| 114 | 118 | struct commitinfo *cgit_parse_commit(struct commit *commit) |
| 115 | 119 | { |
| @@ -6,6 +6,10 @@ · 5 unmodified lines | ||
| 6 | 6 | * (see COPYING for full license text) |
| 7 | 7 | */ |
| 8 | 8 | |
| 9 | +/* This is needed for strcasestr to be defined by <string.h> */ | |
| 10 | +#define _GNU_SOURCE 1 | |
| 11 | +#include <string.h> | |
| 12 | + | |
| 9 | 13 | #include <time.h> |
| 10 | 14 | |
| 11 | 15 | #include "cgit.h" |