提交 e88856b4 编写于 作者: D Dennis Stosberg 提交者: Junio C Hamano

Fix compilation on newer NetBSD systems

NetBSD >=2.0 has iconv() in libc.  A libiconv is not required and
does not exist.

See: http://netbsd.gw.com/cgi-bin/man-cgi?iconv+3+NetBSD-2.0

[jc: with a bit of simplification later discussed on the list.]
Signed-off-by: NDennis Stosberg <dennis@stosberg.net>
Signed-off-by: NJunio C Hamano <junkio@cox.net>
上级 c8df633b
...@@ -281,7 +281,9 @@ ifeq ($(uname_S),OpenBSD) ...@@ -281,7 +281,9 @@ ifeq ($(uname_S),OpenBSD)
ALL_LDFLAGS += -L/usr/local/lib ALL_LDFLAGS += -L/usr/local/lib
endif endif
ifeq ($(uname_S),NetBSD) ifeq ($(uname_S),NetBSD)
NEEDS_LIBICONV = YesPlease ifeq ($(shell expr "$(uname_R)" : '[01]\.'),2)
NEEDS_LIBICONV = YesPlease
endif
ALL_CFLAGS += -I/usr/pkg/include ALL_CFLAGS += -I/usr/pkg/include
ALL_LDFLAGS += -L/usr/pkg/lib -Wl,-rpath,/usr/pkg/lib ALL_LDFLAGS += -L/usr/pkg/lib -Wl,-rpath,/usr/pkg/lib
endif endif
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册