diff -ru purge-orig/Makefile purge/Makefile --- purge-orig/Makefile 2007-01-07 23:29:52.000000000 +0100 +++ purge/Makefile 2007-01-07 23:35:42.000000000 +0100 @@ -26,7 +26,7 @@ MAJOR = $(firstword $(subst ., ,$(VERSION))) MINOR = $(strip $(word 2,$(subst ., ,$(VERSION)))) LOADLIBES = -SOCKLEN = int # default except for glibc2? +SOCKLEN = socklen_t # default except for glibc2? # optimization levels - Do *not* use levels above -O1 with g++, # if -fprofile-arcs or -ftest-coverage is selected! Set to different @@ -34,7 +34,7 @@ # # - OPT_NORM for normal level optimization, O2 is a good choice. # -OPT_NORM = -O2 +OPT_NORM = # electric fence library, for test purposes only (helps w/ memory leaks) # (developers only) @@ -58,7 +58,7 @@ # ## g++ settings for Solaris on Ultra Sparcs (comment out all of above): CXXFLAGS += -DSOLARIS # -ggdb -OPT_NORM = -O2 # -mcpu=supersparc +OPT_NORM = LD = $(CC) ## #EXTRALIB += -lnsl -lsocket -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic @@ -85,7 +85,7 @@ CC = cc -n32 -mips3 -r4000 CXXFLAGS = -woff 1174 -LANG:exceptions=off -DHAS_BOOL -DHAS_PSIGNAL LD = $(CXX) -OPT_NORM = -O3 -IPA -LNO:opt=1 +OPT_NORM = # for g++ #CXXFLAGS += -mips3 -mcpu=r4000 endif @@ -99,7 +99,7 @@ CC = xlc CXXFLAGS = -qtune=pwr # -qdbxextra -g #CXX = g++ -ffor-scope -DHAS_BOOL -UHAS_PSIGNAL -SOCKLEN = size_t +SOCKLEN = socklen_t LD = $(CXX) endif @@ -108,10 +108,10 @@ LIBCVER = $(shell /bin/ls /lib/libc.so.? | \ awk -F'.' '{ if (m<$$3) m=$$3;} END { print m} ') ifeq (6,${LIBCVER}) -SOCKLEN = size_t +SOCKLEN = socklen_t endif CXXFLAGS += -DHAS_PSIGNAL -DLIBCVERSION=$(LIBCVER) -pipe # -Wall -pedantic -OPT_NORM = -march=pentium -O2 +OPT_NORM = # if your g++ balks (e.g. SuSE still uses 2.7.2.3) #CXXFLAGS += -DHAS_PSIGNAL -DLIBCVERSION=$(LIBCVER) -m486 LD = $(CC)