$OpenBSD: patch-Makefile_bsd,v 1.1.1.1 2008/07/17 04:31:45 jdixon Exp $ --- Makefile.bsd.orig Sat Jun 21 15:59:05 2008 +++ Makefile.bsd Tue Jul 15 12:51:26 2008 @@ -19,13 +19,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 || : @@ -36,7 +36,7 @@ COPTS.openbsd = -DENABLE_POLL -DENABLE_KQUEUE LIBS.openbsd = # CPU dependant optimizations -COPTS.generic = -O2 +#COPTS.generic = -O2 COPTS.i586 = -O2 -march=i586 COPTS.i686 = -O2 -march=i686 COPTS.ultrasparc = -O6 -mcpu=v9 -mtune=ultrasparc @@ -51,11 +51,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 @@ -95,8 +95,8 @@ VER_OPTS := -DCONFIG_HAPROXY_VERSION=\"$(VERSION)$(SUB COPTS = -Iinclude $(ADDINC) $(CPU_OPTS) $(TARGET_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 \