mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-11 06:56:22 +02:00
Code

Makefile: add NEEDS_RESOLV to optionally add -lresolv to compile arguments 

This library is required on Solaris when compiling with NO_IPV6 since
hstrerror resides in libresolv.  Additionally, Solaris 7 will need it,
since inet_ntop and inet_pton reside there too.

Signed-off-by: Brandon Casey <drafnel@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Brandon Casey 2009-06-05 18:36:10 -05:00 committed by Junio C Hamano
parent efc07debaf
commit 70cf991093
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile
View File

@ -91,6 +91,10 @@ all::
# Define NEEDS_SOCKET if linking with libc is not enough (SunOS, # Define NEEDS_SOCKET if linking with libc is not enough (SunOS,
# Patrick Mauritz). # Patrick Mauritz).
# #
# Define NEEDS_RESOLV if linking with -lnsl and/or -lsocket is not enough.
# Notably on Solaris hstrerror resides in libresolv and on Solaris 7
# inet_ntop and inet_pton additionally reside there.
#
# Define NO_MMAP if you want to avoid mmap. # Define NO_MMAP if you want to avoid mmap.
# #
# Define NO_PTHREADS if you do not have or do not want to use Pthreads. # Define NO_PTHREADS if you do not have or do not want to use Pthreads.
@ -700,7 +704,6 @@ ifeq ($(uname_S),SunOS)
SHELL_PATH = /bin/bash SHELL_PATH = /bin/bash
NO_STRCASESTR = YesPlease NO_STRCASESTR = YesPlease
NO_MEMMEM = YesPlease NO_MEMMEM = YesPlease
NO_HSTRERROR = YesPlease
NO_MKDTEMP = YesPlease NO_MKDTEMP = YesPlease
OLD_ICONV = UnfortunatelyYes OLD_ICONV = UnfortunatelyYes
ifeq ($(uname_R),5.8) ifeq ($(uname_R),5.8)
@ -715,6 +718,9 @@ ifeq ($(uname_S),SunOS)
NO_C99_FORMAT = YesPlease NO_C99_FORMAT = YesPlease
NO_STRTOUMAX = YesPlease NO_STRTOUMAX = YesPlease
endif endif
ifdef NO_IPV6
NEEDS_RESOLV = YesPlease
endif
INSTALL = /usr/ucb/install INSTALL = /usr/ucb/install
TAR = gtar TAR = gtar
BASIC_CFLAGS += -D__EXTENSIONS__ BASIC_CFLAGS += -D__EXTENSIONS__
@ -956,6 +962,9 @@ endif
ifdef NEEDS_NSL ifdef NEEDS_NSL
EXTLIBS += -lnsl EXTLIBS += -lnsl
endif endif
ifdef NEEDS_RESOLV
EXTLIBS += -lresolv
endif
ifdef NO_D_TYPE_IN_DIRENT ifdef NO_D_TYPE_IN_DIRENT
BASIC_CFLAGS += -DNO_D_TYPE_IN_DIRENT BASIC_CFLAGS += -DNO_D_TYPE_IN_DIRENT
endif endif