mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-07 15:47:01 +02:00
Code Issues Projects Releases Wiki Activity

[BUILD] makefile: remove unused references to linux24eold and EPOLL_CTL_WORKAROUND

Browse Source 
This option is not implemented anymore but still appeared in the makefile. Get
rid of it.
This commit is contained in:
Willy Tarreau 2009-03-29 15:08:25 +02:00
parent 331099beb8
commit b181465ffd
1 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Makefile
View File

@ -8,7 +8,6 @@
# USE_CTTPROXY : enable CTTPROXY on Linux (needs kernel patch). # USE_CTTPROXY : enable CTTPROXY on Linux (needs kernel patch).
# USE_DLMALLOC : enable use of dlmalloc (see DLMALLOC_SRC) # USE_DLMALLOC : enable use of dlmalloc (see DLMALLOC_SRC)
# USE_EPOLL : enable epoll() on Linux 2.6. Automatic. # USE_EPOLL : enable epoll() on Linux 2.6. Automatic.
# USE_EPOLL_WORKAROUND : enable epoll() bug workaround. Automatic.
# USE_GETSOCKNAME : enable getsockname() on Linux 2.2. Automatic. # USE_GETSOCKNAME : enable getsockname() on Linux 2.2. Automatic.
# USE_KQUEUE : enable kqueue() on BSD. Automatic. # USE_KQUEUE : enable kqueue() on BSD. Automatic.
# USE_MY_EPOLL : redefine epoll_* syscalls. Automatic. # USE_MY_EPOLL : redefine epoll_* syscalls. Automatic.
@ -69,7 +68,7 @@ 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 specifc target OS among the
# following list (use the default "generic" if uncertain) : # following list (use the default "generic" if uncertain) :
# generic, linux22, linux24, linux24e, linux24eold, linux26, solaris, # generic, linux22, linux24, linux24e, linux26, solaris,
# freebsd, openbsd, custom # freebsd, openbsd, custom
TARGET = TARGET =
@ -175,18 +174,6 @@ ifeq ($(TARGET),linux24e)
USE_MY_EPOLL = implicit USE_MY_EPOLL = implicit
USE_TPROXY = implicit USE_TPROXY = implicit
else else
ifeq ($(TARGET),linux24eold)
# This is for enhanced Linux 2.4 with netfilter and epoll() patch <= 0.21,
# which needs a workaround for a very rare bug.
USE_GETSOCKNAME = implicit
USE_NETFILTER = implicit
USE_POLL = implicit
USE_EPOLL = implicit
USE_SEPOLL = implicit
USE_MY_EPOLL = implicit
USE_EPOLL_WORKAROUND = implicit
USE_TPROXY = implicit
else
ifeq ($(TARGET),linux26) ifeq ($(TARGET),linux26)
# This is for standard Linux 2.6 with netfilter and standard epoll() # This is for standard Linux 2.6 with netfilter and standard epoll()
USE_GETSOCKNAME = implicit USE_GETSOCKNAME = implicit
@ -218,7 +205,6 @@ endif # openbsd
endif # freebsd endif # freebsd
endif # solaris endif # solaris
endif # linux26 endif # linux26
endif # linux24eold
endif # linux24e endif # linux24e
endif # linux24 endif # linux24
endif # linux22 endif # linux22
@ -354,11 +340,6 @@ OPTIONS_CFLAGS += -DNETFILTER
BUILD_OPTIONS += $(call ignore_implicit,USE_NETFILTER) BUILD_OPTIONS += $(call ignore_implicit,USE_NETFILTER)
endif endif
ifneq ($(USE_EPOLL_WORKAROUND),)
OPTIONS_CFLAGS += -DEPOLL_CTL_MOD_WORKAROUND
BUILD_OPTIONS += $(call ignore_implicit,USE_EPOLL_WORKAROUND)
endif
ifneq ($(USE_GETSOCKNAME),) ifneq ($(USE_GETSOCKNAME),)
OPTIONS_CFLAGS += -DUSE_GETSOCKNAME OPTIONS_CFLAGS += -DUSE_GETSOCKNAME
BUILD_OPTIONS += $(call ignore_implicit,USE_GETSOCKNAME) BUILD_OPTIONS += $(call ignore_implicit,USE_GETSOCKNAME)
@ -442,7 +423,7 @@ all:
@echo @echo
@echo "Please choose the target among the following supported list :" @echo "Please choose the target among the following supported list :"
@echo @echo
@echo " linux26, linux24, linux24e, linux24eold, linux22, solaris" @echo " linux26, linux24, linux24e, linux22, solaris"
@echo " freebsd, openbsd, custom, generic" @echo " freebsd, openbsd, custom, generic"
@echo @echo
@echo "Use \"generic\" if you don't want any optimization, \"custom\" if you" @echo "Use \"generic\" if you don't want any optimization, \"custom\" if you"