e2abff372f
- MINOR: stats admin: allow unordered parameters in POST requests
- BUG/MAJOR: possible crash when using capture headers on TCP frontends
- MINOR: config: disable header captures in TCP mode and complain
- CLEANUP: http: message parser must ignore HTTP_MSG_ERROR
- BUG/MAJOR: checks: don't call set_server_status_* when no LB algo is set
- MINOR: proxy: make findproxy() return proxies from numeric IDs too
- BUG/MINOR: stop connect timeout when connect succeeds
And others (http://haproxy.1wt.eu/download/1.4/src/CHANGELOG), while here GROFF is not needed,
add a rc.d(8) script and maintainer drop maintainership.
Tested on i386.
Ok sthen@ (untested)
56 lines
1.9 KiB
Plaintext
56 lines
1.9 KiB
Plaintext
$OpenBSD: patch-Makefile_bsd,v 1.2 2012/08/27 13:03:06 gonzalo Exp $
|
|
--- Makefile.bsd.orig Mon May 21 02:03:24 2012
|
|
+++ Makefile.bsd Fri Aug 10 10:12:34 2012
|
|
@@ -20,13 +20,13 @@ CPU = generic
|
|
|
|
# By default, we use libc's regex. WARNING! On Solaris 8/Sparc, group
|
|
# references seem broken using libc ! Use pcre instead.
|
|
-REGEX=libc
|
|
+#REGEX=libc
|
|
#REGEX=pcre
|
|
-#REGEX=static-pcre
|
|
+REGEX=static-pcre
|
|
|
|
# tools options
|
|
-CC = gcc
|
|
-LD = gcc
|
|
+CC ?= gcc
|
|
+LD ?= gcc
|
|
|
|
# This is the directory hosting include/pcre.h and lib/libpcre.* when REGEX=pcre
|
|
PCREDIR!= pcre-config --prefix 2>/dev/null || :
|
|
@@ -37,7 +37,7 @@ COPTS.openbsd = -DENABLE_POLL -DENABLE_KQUEUE
|
|
LIBS.openbsd =
|
|
|
|
# CPU dependant optimizations
|
|
-COPTS.generic = -O2
|
|
+#COPTS.generic = -O2
|
|
COPTS.native = -O2 -march=native
|
|
COPTS.i586 = -O2 -march=i586
|
|
COPTS.i686 = -O2 -march=i686
|
|
@@ -53,11 +53,11 @@ LIBS.pcre=-L$(PCREDIR)/lib -lpcreposix -lpcre
|
|
|
|
# options for static libpcre
|
|
COPTS.static-pcre=-DUSE_PCRE -I$(PCREDIR)/include
|
|
-LIBS.static-pcre=-L$(PCREDIR)/lib -Wl,-Bstatic -lpcreposix -lpcre -Wl,-Bdynamic
|
|
+LIBS.static-pcre=-L$(PCREDIR)/lib -Bstatic -lpcreposix -lpcre -Bdynamic
|
|
|
|
# you can enable debug arguments with "DEBUG=-g" or disable them with "DEBUG="
|
|
#DEBUG = -g -DDEBUG_MEMORY -DDEBUG_FULL
|
|
-DEBUG = -g
|
|
+#DEBUG = -g
|
|
|
|
# if small memory footprint is required, you can reduce the buffer size. There
|
|
# are 2 buffers per concurrent session, so 16 kB buffers will eat 32 MB memory
|
|
@@ -101,8 +101,8 @@ EBTREE_DIR := ebtree
|
|
COPTS = -Iinclude -I$(EBTREE_DIR) $(ADDINC) $(CPU_OPTS) $(TARGET_OPTS) \
|
|
$(SPEC_OPTS) $(REGEX_OPTS) $(SMALL_OPTS) $(VER_OPTS) $(DEFINE)
|
|
LIBS = $(LIBS.$(TARGET)) $(LIBS.$(REGEX)) $(ADDLIB)
|
|
-CFLAGS = -Wall $(COPTS) $(DEBUG)
|
|
-LDFLAGS = -g
|
|
+CFLAGS += -Wall $(COPTS) $(DEBUG)
|
|
+#LDFLAGS = -g
|
|
|
|
OBJS = src/haproxy.o src/sessionhash.o src/base64.o src/protocols.o \
|
|
src/uri_auth.o src/standard.o src/buffers.o src/log.o src/task.o \
|