You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
gentoo-overlay/dev-vcs/git/files/git-2.5.1-freebsd-10.x-no-i...

15 lines
568 B

diff -Naurp git-2.5.1.orig/config.mak.uname git-2.5.1/config.mak.uname
--- git-2.5.1.orig/config.mak.uname 2015-08-28 15:37:13.000000000 -0400
+++ git-2.5.1/config.mak.uname 2015-09-06 18:54:28.538437000 -0400
@@ -189,7 +189,9 @@ ifeq ($(uname_O),Cygwin)
SPARSE_FLAGS = -isystem /usr/include/w32api -Wno-one-bit-signed-bitfield
endif
ifeq ($(uname_S),FreeBSD)
- NEEDS_LIBICONV = YesPlease
+ ifeq ($(shell expr "$(uname_R)" : '[1-9]\.'),2)
+ NEEDS_LIBICONV = YesPlease
+ endif
OLD_ICONV = YesPlease
NO_MEMMEM = YesPlease
BASIC_CFLAGS += -I/usr/local/include