"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "Makefile" between
haproxy-2.0.13.tar.gz and haproxy-2.0.14.tar.gz

About: HAProxy is a TCP/HTTP reverse proxy which is particularly suited for high availability environments. LTS (Long-Term Support) release.

Makefile  (haproxy-2.0.13):Makefile  (haproxy-2.0.14)
skipping to change at line 44 skipping to change at line 44
# USE_LINUX_TPROXY : enable full transparent proxy. Automatic. # USE_LINUX_TPROXY : enable full transparent proxy. Automatic.
# USE_LINUX_SPLICE : enable kernel 2.6 splicing. Automatic. # USE_LINUX_SPLICE : enable kernel 2.6 splicing. Automatic.
# USE_LIBCRYPT : enable crypted passwords using -lcrypt # USE_LIBCRYPT : enable crypted passwords using -lcrypt
# USE_CRYPT_H : set it if your system requires including crypt.h # USE_CRYPT_H : set it if your system requires including crypt.h
# USE_VSYSCALL : enable vsyscall on Linux x86, bypassing libc # USE_VSYSCALL : enable vsyscall on Linux x86, bypassing libc
# USE_GETADDRINFO : use getaddrinfo() to resolve IPv6 host names. # USE_GETADDRINFO : use getaddrinfo() to resolve IPv6 host names.
# USE_OPENSSL : enable use of OpenSSL. Recommended, but see below. # USE_OPENSSL : enable use of OpenSSL. Recommended, but see below.
# USE_LUA : enable Lua support. # USE_LUA : enable Lua support.
# USE_FUTEX : enable use of futex on kernel 2.6. Automatic. # USE_FUTEX : enable use of futex on kernel 2.6. Automatic.
# USE_ACCEPT4 : enable use of accept4() on linux. Automatic. # USE_ACCEPT4 : enable use of accept4() on linux. Automatic.
# USE_MY_ACCEPT4 : use own implemention of accept4() if glibc < 2.10. # USE_MY_ACCEPT4 : use own implementation of accept4() if glibc < 2.10.
# USE_PRCTL : enable use of prctl(). Automatic. # USE_PRCTL : enable use of prctl(). Automatic.
# USE_ZLIB : enable zlib library support. # USE_ZLIB : enable zlib library support.
# USE_SLZ : enable slz library instead of zlib (pick at most one) . # USE_SLZ : enable slz library instead of zlib (pick at most one) .
# USE_CPU_AFFINITY : enable pinning processes to CPU on Linux. Automatic. # USE_CPU_AFFINITY : enable pinning processes to CPU on Linux. Automatic.
# USE_TFO : enable TCP fast open. Supported on Linux >= 3.7. # USE_TFO : enable TCP fast open. Supported on Linux >= 3.7.
# USE_NS : enable network namespace support. Supported on Linux >= 2.6.24. # USE_NS : enable network namespace support. Supported on Linux >= 2.6.24.
# USE_DL : enable it if your system requires -ldl. Automatic on Linux. # USE_DL : enable it if your system requires -ldl. Automatic on Linux.
# USE_RT : enable it if your system requires -lrt. Automatic on Linux. # USE_RT : enable it if your system requires -lrt. Automatic on Linux.
# USE_DEVICEATLAS : enable DeviceAtlas api. # USE_DEVICEATLAS : enable DeviceAtlas api.
# USE_51DEGREES : enable third party device detection library from 51De grees # USE_51DEGREES : enable third party device detection library from 51De grees
skipping to change at line 142 skipping to change at line 142
cc-nowarn = $(shell set -e; if $(CC) -W$(1) -E -xc - -o /dev/null </dev/null >&0 2>&0; then echo "-Wno-$(1)"; fi;) cc-nowarn = $(shell set -e; if $(CC) -W$(1) -E -xc - -o /dev/null </dev/null >&0 2>&0; then echo "-Wno-$(1)"; fi;)
#### Installation options. #### Installation options.
DESTDIR = DESTDIR =
PREFIX = /usr/local PREFIX = /usr/local
SBINDIR = $(PREFIX)/sbin SBINDIR = $(PREFIX)/sbin
MANDIR = $(PREFIX)/share/man MANDIR = $(PREFIX)/share/man
DOCDIR = $(PREFIX)/doc/haproxy DOCDIR = $(PREFIX)/doc/haproxy
#### TARGET system #### TARGET system
# Use TARGET=<target_name> to optimize for a specifc target OS among the # Use TARGET=<target_name> to optimize for a specific target OS among the
# following list (use the default "generic" if uncertain) : # following list (use the default "generic" if uncertain) :
# linux-glibc, linux-glibc-legacy, solaris, freebsd, openbsd, netbsd, # linux-glibc, linux-glibc-legacy, solaris, freebsd, openbsd, netbsd,
# cygwin, haiku, aix51, aix52, osx, generic, custom # cygwin, haiku, aix51, aix52, osx, generic, custom
TARGET = TARGET =
#### TARGET CPU #### TARGET CPU
# Use CPU=<cpu_name> to optimize for a particular CPU, among the following # Use CPU=<cpu_name> to optimize for a particular CPU, among the following
# list : # list :
# generic, native, i586, i686, ultrasparc, custom # generic, native, i586, i686, ultrasparc, custom
CPU = generic CPU = generic
skipping to change at line 247 skipping to change at line 247
# CONNECT_DEFAULT_CIPHERS is a cipher suite string used to set the default # CONNECT_DEFAULT_CIPHERS is a cipher suite string used to set the default
# SSL ciphers on "server" lines instead of using OpenSSL's defaults. # SSL ciphers on "server" lines instead of using OpenSSL's defaults.
DEFINE = DEFINE =
SILENT_DEFINE = SILENT_DEFINE =
#### extra programs to build #### extra programs to build
# Force this to enable building extra programs or to disable them. # Force this to enable building extra programs or to disable them.
# It's automatically appended depending on the targets. # It's automatically appended depending on the targets.
EXTRA = EXTRA =
#### CPU dependant optimizations #### CPU dependent optimizations
# Some CFLAGS are set by default depending on the target CPU. Those flags only # Some CFLAGS are set by default depending on the target CPU. Those flags only
# feed CPU_CFLAGS, which in turn feed CFLAGS, so it is not mandatory to use # feed CPU_CFLAGS, which in turn feed CFLAGS, so it is not mandatory to use
# them. You should not have to change these options. Better use CPU_CFLAGS or # them. You should not have to change these options. Better use CPU_CFLAGS or
# even CFLAGS instead. # even CFLAGS instead.
CPU_CFLAGS.generic = -O2 CPU_CFLAGS.generic = -O2
CPU_CFLAGS.native = -O2 -march=native CPU_CFLAGS.native = -O2 -march=native
CPU_CFLAGS.i586 = -O2 -march=i586 CPU_CFLAGS.i586 = -O2 -march=i586
CPU_CFLAGS.i686 = -O2 -march=i686 CPU_CFLAGS.i686 = -O2 -march=i686
CPU_CFLAGS.ultrasparc = -O6 -mcpu=v9 -mtune=ultrasparc CPU_CFLAGS.ultrasparc = -O6 -mcpu=v9 -mtune=ultrasparc
CPU_CFLAGS = $(CPU_CFLAGS.$(CPU)) CPU_CFLAGS = $(CPU_CFLAGS.$(CPU))
#### ARCH dependant flags, may be overridden by CPU flags #### ARCH dependent flags, may be overridden by CPU flags
ARCH_FLAGS.32 = -m32 ARCH_FLAGS.32 = -m32
ARCH_FLAGS.64 = -m64 ARCH_FLAGS.64 = -m64
ARCH_FLAGS.i386 = -m32 -march=i386 ARCH_FLAGS.i386 = -m32 -march=i386
ARCH_FLAGS.i486 = -m32 -march=i486 ARCH_FLAGS.i486 = -m32 -march=i486
ARCH_FLAGS.i586 = -m32 -march=i586 ARCH_FLAGS.i586 = -m32 -march=i586
ARCH_FLAGS.i686 = -m32 -march=i686 ARCH_FLAGS.i686 = -m32 -march=i686
ARCH_FLAGS.x86_64 = -m64 -march=x86-64 ARCH_FLAGS.x86_64 = -m64 -march=x86-64
ARCH_FLAGS = $(ARCH_FLAGS.$(ARCH)) ARCH_FLAGS = $(ARCH_FLAGS.$(ARCH))
#### Common CFLAGS #### Common CFLAGS
skipping to change at line 327 skipping to change at line 327
set_target_defaults = $(call default_opts,USE_POLL USE_TPROXY) set_target_defaults = $(call default_opts,USE_POLL USE_TPROXY)
endif endif
# For linux >= 2.6.28 and glibc # For linux >= 2.6.28 and glibc
ifeq ($(TARGET),linux-glibc) ifeq ($(TARGET),linux-glibc)
set_target_defaults = $(call default_opts, \ set_target_defaults = $(call default_opts, \
USE_POLL USE_TPROXY USE_LIBCRYPT USE_DL USE_RT USE_CRYPT_H USE_NETFILTER \ USE_POLL USE_TPROXY USE_LIBCRYPT USE_DL USE_RT USE_CRYPT_H USE_NETFILTER \
USE_CPU_AFFINITY USE_THREAD USE_EPOLL USE_FUTEX USE_LINUX_TPROXY \ USE_CPU_AFFINITY USE_THREAD USE_EPOLL USE_FUTEX USE_LINUX_TPROXY \
USE_ACCEPT4 USE_LINUX_SPLICE USE_PRCTL USE_THREAD_DUMP USE_NS USE_TFO \ USE_ACCEPT4 USE_LINUX_SPLICE USE_PRCTL USE_THREAD_DUMP USE_NS USE_TFO \
USE_GETADDRINFO) USE_GETADDRINFO)
ifneq ($(shell echo __arm__/__aarch64__ | $(CC) -E -xc - | grep '^[^\#]'),__arm_
_/__aarch64__)
TARGET_LDFLAGS=-latomic
endif
endif endif
# For linux >= 2.6.28, glibc without new features # For linux >= 2.6.28, glibc without new features
ifeq ($(TARGET),linux-glibc-legacy) ifeq ($(TARGET),linux-glibc-legacy)
set_target_defaults = $(call default_opts, \ set_target_defaults = $(call default_opts, \
USE_POLL USE_TPROXY USE_LIBCRYPT USE_DL USE_RT USE_CRYPT_H USE_NETFILTER \ USE_POLL USE_TPROXY USE_LIBCRYPT USE_DL USE_RT USE_CRYPT_H USE_NETFILTER \
USE_CPU_AFFINITY USE_THREAD USE_EPOLL USE_FUTEX USE_LINUX_TPROXY \ USE_CPU_AFFINITY USE_THREAD USE_EPOLL USE_FUTEX USE_LINUX_TPROXY \
USE_ACCEPT4 USE_LINUX_SPLICE USE_PRCTL USE_THREAD_DUMP USE_GETADDRINFO) USE_ACCEPT4 USE_LINUX_SPLICE USE_PRCTL USE_THREAD_DUMP USE_GETADDRINFO)
endif endif
 End of changes. 5 change blocks. 
4 lines changed or deleted 8 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)