mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
config.mak.uname: resolve FreeBSD iconv-related compilation warning
OLD_ICONV has long been needed by FreeBSD so config.mak.uname defines it unconditionally. However, recent versions do not need it, and its presence results in compilation warnings. Resolve this issue by defining OLD_ICONV only for older FreeBSD versions. Specifically, revision r281550[1], which is part of FreeBSD 11, removed the need for OLD_ICONV, and r282275[2] back-ported that change to 10.2. Versions prior to 10.2 do need it. [1]b0813ee288
[2]b709ec868a
[es: commit message; tweak version check to distinguish 10.x versions] Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
53f9a3e157
commit
6c6ce21baa
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue