diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-09-04 14:31:39 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-09-04 14:31:39 -0700 |
| commit | b571c25e33cc8d7ac1cae66e34ce60fa7a0a3b0a (patch) | |
| tree | e6c83e3b6107a5aca60f85b5dac03020e4abea89 | |
| parent | Merge branch 'ds/commit-graph-lockfile-fix' (diff) | |
| parent | config.mak.uname: resolve FreeBSD iconv-related compilation warning (diff) | |
| download | tgif-b571c25e33cc8d7ac1cae66e34ce60fa7a0a3b0a.tar.xz | |
Merge branch 'es/freebsd-iconv-portability'
Build fix.
* es/freebsd-iconv-portability:
config.mak.uname: resolve FreeBSD iconv-related compilation warning
| -rw-r--r-- | config.mak.uname | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/config.mak.uname b/config.mak.uname index 2be2f19811..e47af72e01 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -192,7 +192,17 @@ ifeq ($(uname_O),Cygwin) endif ifeq ($(uname_S),FreeBSD) NEEDS_LIBICONV = YesPlease - OLD_ICONV = YesPlease + # Versions up to 10.1 require OLD_ICONV; 10.2 and beyond don't. + # A typical version string looks like "10.2-RELEASE". + ifeq ($(shell expr "$(uname_R)" : '[1-9]\.'),2) + OLD_ICONV = YesPlease + endif + ifeq ($(firstword $(subst -, ,$(uname_R))),10.0) + OLD_ICONV = YesPlease + endif + ifeq ($(firstword $(subst -, ,$(uname_R))),10.1) + OLD_ICONV = YesPlease + endif NO_MEMMEM = YesPlease BASIC_CFLAGS += -I/usr/local/include BASIC_LDFLAGS += -L/usr/local/lib |