Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

3.4 musl fixes #3263

Merged
merged 5 commits into from
Jan 20, 2016
Merged

3.4 musl fixes #3263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9322aee
Remove hardcoded -lresolv, -lnsl and -lsocket
rubenk Dec 24, 2014
7b7a3af
Check for inet_aton in libresolv
rubenk Jan 2, 2015
cb38288
Indent
rubenk Jan 2, 2015
edfa60a
Use AC_SEARCH_LIBS
rubenk Jan 2, 2015
a2e5c28
Enable IPv6 in Travis
pieterlexis Jan 19, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ compiler:
- clang
before_script:
- git describe --always --dirty=+
- sudo sysctl net.ipv6.conf.lo.disable_ipv6=0
- sudo /sbin/ip addr add 10.0.3.0/24 dev lo
- sudo /sbin/ip addr add 1.2.3.4/32 dev lo
- sudo rm /etc/apt/sources.list.d/travis_ci_zeromq3-source.list
Expand Down
28 changes: 6 additions & 22 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,9 @@ AS_IF([test "x$enable_hardening" != "xno"], [
AC_LD_RELRO
])

AC_CHECK_FUNC([socket], [], [
AC_CHECK_LIB([socket], [socket], [LIBS="-lsocket $LIBS"])
])

AC_CHECK_FUNC([gethostent], [], [
AC_CHECK_LIB([nsl], [gethostent], [LIBS="-lnsl $LIBS"])
])
AC_SEARCH_LIBS([socket], [socket])
AC_SEARCH_LIBS([gethostent], [nsl])
AC_SEARCH_LIBS([inet_aton], [resolv])

m4_ifndef([LT_INIT],[
AC_PROG_LIBTOOL([disable-static])
Expand Down Expand Up @@ -164,21 +160,20 @@ AM_CONDITIONAL([OS_MACOSX], false)
case "$host_os" in
solaris2.10)
AC_DEFINE(HAVE_IPV6,1,[If the host operating system understands IPv6])
LIBS="-lposix4 -lresolv -lnsl -lsocket -lpthread -lrt $LIBS"
LIBS="-lposix4 -lpthread -lrt $LIBS"
CXXFLAGS="-D_REENTRANT $CXXFLAGS"
;;

solaris2.8 | solaris2.9 )
AC_DEFINE(NEED_POSIX_TYPEDEF,,[If POSIX typedefs need to be defined])
AC_DEFINE(NEED_INET_NTOP_PROTO,,[If your OS is so broken that it needs an additional prototype])
AC_DEFINE(HAVE_IPV6,1,[If the host operating system understands IPv6])
LIBS="-lposix4 -lresolv -lnsl -lsocket -lpthread $LIBS"
LIBS="-lposix4 -lpthread $LIBS"
CXXFLAGS="-D_REENTRANT $CXXFLAGS"
;;
solaris2.6 | solaris2.7)
AC_DEFINE(NEED_POSIX_TYPEDEF,,[If POSIX typedefs need to be defined])
AC_DEFINE(NEED_INET_NTOP_PROTO,,[If your OS is so broken that it needs an additional prototype])
LIBS="-lposix4 -lresolv -lnsl -lsocket -lpthread $LIBS"
LIBS="-lposix4 -lpthread $LIBS"
CXXFLAGS="-D_REENTRANT $CXXFLAGS"
;;
linux*)
Expand Down Expand Up @@ -332,17 +327,6 @@ for a in $modules; do

if test ${a} = "gpgsql"; then
LIBS="$LIBS $LIBCRYPT"

case "$host_os" in
freebsd*)
;;
darwin*)
modulelibs="$modulelibs -lresolv"
;;
*)
modulelibs="$modulelibs -lresolv -lnsl"
;;
esac
fi
done

Expand Down