On Thu, Oct 01, 2020 at 10:08:47AM +0200, Willy Tarreau wrote:
> On Wed, Sep 30, 2020 at 04:54:30PM -0400, Brad Smith wrote:
> > On 9/30/2020 4:22 PM, ???? ??????? wrote:
> > > there also several documentation files like this one
> > > https://github.com/haproxy/haproxy/blob/master/INSTALL#L159
> > > <https://github.com/haproxy/haproxy/blob/master/INSTALL#L159>
> > >
> > > can you please review documentation as well ?
> >
> > That seems to be the only file. I will update the relevant bits there too.
>
> OK so I'll take your new patch instead.
diff --git a/INSTALL b/INSTALL
index 69fe94f42..04b034908 100644
--- a/INSTALL
+++ b/INSTALL
@@ -374,7 +374,7 @@ and assign it to the TARGET variable :
- linux-glibc for Linux kernel 2.6.28 and above
- linux-glibc-legacy for Linux kernel 2.6.28 and above without new features
- linux-musl for Linux kernel 2.6.28 and above with musl libc
- - solaris for Solaris 8 or 10 (others untested)
+ - solaris for Solaris 10 and above
- freebsd for FreeBSD 5 to 12 (others untested)
- netbsd for NetBSD
- osx for Mac OS/X
diff --git a/Makefile b/Makefile
index 197126db5..77bf9ff3c 100644
--- a/Makefile
+++ b/Makefile
@@ -353,12 +353,11 @@ ifneq ($(shell echo __arm__/__aarch64__ | $(CC) -E -xc -
| grep '^[^\#]'),__arm_
endif
endif
-# Solaris 8 and above
+# Solaris 10 and above
ifeq ($(TARGET),solaris)
- # We also enable getaddrinfo() which works since solaris 8.
set_target_defaults = $(call default_opts, \
USE_POLL USE_TPROXY USE_LIBCRYPT USE_CRYPT_H USE_GETADDRINFO USE_THREAD \
- USE_RT USE_OBSOLETE_LINKER USE_EVPORTS)
+ USE_RT USE_OBSOLETE_LINKER USE_EVPORTS USE_CLOSEFROM)
TARGET_CFLAGS = -DFD_SETSIZE=65536 -D_REENTRANT -D_XOPEN_SOURCE=500
-D__EXTENSIONS__
TARGET_LDFLAGS = -lnsl -lsocket
endif
