diff options
Diffstat (limited to 'net/ser/files/patch-Makefile.defs')
| -rw-r--r-- | net/ser/files/patch-Makefile.defs | 116 |
1 files changed, 89 insertions, 27 deletions
diff --git a/net/ser/files/patch-Makefile.defs b/net/ser/files/patch-Makefile.defs index 53bca69ecc5e..3e3b9e78cef3 100644 --- a/net/ser/files/patch-Makefile.defs +++ b/net/ser/files/patch-Makefile.defs @@ -3,10 +3,10 @@ $FreeBSD$ --- Makefile.defs.orig +++ Makefile.defs -@@ -133,10 +133,11 @@ +@@ -151,10 +151,11 @@ INSTALL-TOUCH = touch # used to create the file first (good to # make solaris install work) - # INSTALL-CFG = $(INSTALL) -m 644 + INSTALL-CFG = $(INSTALL) -m 644 -INSTALL-BIN = $(INSTALL) -m 755 -INSTALL-MODULES = $(INSTALL) -m 755 -INSTALL-DOC = $(INSTALL) -m 644 @@ -19,22 +19,7 @@ $FreeBSD$ #set some vars from the environment (and not make builtins) CC := $(shell echo "$${CC}") -@@ -285,10 +286,11 @@ - -DPKG_MALLOC \ - -DSHM_MEM -DSHM_MMAP \ - -DDNS_IP_HACK \ -- -DUSE_IPV6 \ -- -DUSE_TCP \ - -DDISABLE_NAGLE \ -- -DF_MALLOC \ -+ -DNO_DEBUG \ -+ -DUSE_IPV6 \ -+ -DUSE_TCP -+ # -DF_MALLOC \ - # -DDBG_QM_MALLOC \ - # -DDBG_QM_MALLOC \ - # -DF_MALLOC \ -@@ -408,8 +410,8 @@ +@@ -444,8 +445,8 @@ found_lock_method=yes endif @@ -45,16 +30,24 @@ $FreeBSD$ # setting CFLAGS ifeq ($(mode), release) #if i386 -@@ -417,7 +419,7 @@ +@@ -453,14 +454,13 @@ # if gcc ifeq ($(CC_NAME), gcc) #common stuff - CFLAGS=-g -O9 -funroll-loops -Wcast-align $(PROFILE) \ + CFLAGS+=-funroll-loops -Wcast-align $(PROFILE) \ - -Wall \ - #if gcc 3.0 + -Wall + #if gcc 3.4+ + ifeq ($(CC_SHORTVER), 3.4) + CPU ?= athlon + CFLAGS+=-minline-all-stringops -malign-double \ +- -falign-loops \ +- -mtune=$(CPU) ++ -falign-loops + else + #if gcc 3.0+ ifeq ($(CC_SHORTVER), 3.0) -@@ -443,7 +445,7 @@ +@@ -486,7 +486,7 @@ else # CC_NAME, gcc ifeq ($(CC_NAME), icc) @@ -63,7 +56,25 @@ $FreeBSD$ -tpp6 -xK #-openmp #optimize for PIII # -prefetch doesn't seem to work #( ty to inline acroos files, unroll loops,prefetch, -@@ -462,7 +464,7 @@ +@@ -504,7 +504,7 @@ + # if gcc + ifeq ($(CC_NAME), gcc) + #common stuff +- CFLAGS=-g -O9 -funroll-loops -Wcast-align $(PROFILE) \ ++ CFLAGS+=-funroll-loops -Wcast-align $(PROFILE) \ + -Wall + #if gcc 3.4 + ifeq ($(CC_SHORTVER), 3.4) +@@ -537,7 +537,7 @@ + + else # CC_NAME, gcc + ifeq ($(CC_NAME), icc) +- CFLAGS=-g -O3 -ipo -ipo_obj -unroll $(PROFILE) \ ++ CFLAGS+=-ipo -ipo_obj -unroll $(PROFILE) \ + -tpp6 -xK #-openmp #optimize for PIII + # -prefetch doesn't seem to work + #( ty to inline acroos files, unroll loops,prefetch, +@@ -555,7 +555,7 @@ #if gcc ifeq ($(CC_NAME), gcc) #common stuff @@ -72,12 +83,63 @@ $FreeBSD$ -Wall\ #-Wcast-align \ #-Wmissing-prototypes -@@ -520,7 +522,7 @@ +@@ -620,7 +620,7 @@ # if gcc ifeq ($(CC_NAME), gcc) #common stuff - CFLAGS=-O9 -funroll-loops -Wcast-align $(PROFILE) \ + CFLAGS+=-funroll-loops -Wcast-align $(PROFILE) \ - -Wall \ - #if gcc 3.0 - ifeq ($(CC_SHORTVER), 3.0) + -Wall + #if gcc 3.4+ + ifeq ($(CC_SHORTVER), 3.4) +@@ -656,7 +656,7 @@ + # if gcc + ifeq ($(CC_NAME), gcc) + #common stuff +- CFLAGS=-O9 -funroll-loops -Wcast-align $(PROFILE) \ ++ CFLAGS+=-funroll-loops -Wcast-align $(PROFILE) \ + -Wall + #if gcc 3.4+ + ifeq ($(CC_SHORTVER), 3.4) +@@ -692,7 +692,7 @@ + # if gcc + ifeq ($(CC_NAME), gcc) + #common stuff +- CFLAGS= -mips2 -O9 -funroll-loops $(PROFILE) \ ++ CFLAGS+= -mips2 -funroll-loops $(PROFILE) \ + -Wall + #if gcc 3.4+ + ifeq ($(CC_SHORTVER), 3.4) +@@ -856,7 +856,7 @@ + # -andrei + else #mode,release + ifeq ($(CC_NAME), gcc) +- CFLAGS=-g -Wcast-align $(PROFILE) ++ CFLAGS+=-Wcast-align $(PROFILE) + ifeq ($(ARCH), sparc64) + CFLAGS+= -mcpu=ultrasparc + endif +@@ -871,12 +871,12 @@ + endif + endif + ifeq ($(CC_NAME), icc) +- CFLAGS=-g $(PROFILE) ++ CFLAGS+=$(PROFILE) + LDFLAGS+=-g -Wl,-E $(PROFILE) + MOD_LDFLAGS=-shared $(LDFLAGS) + endif + ifeq ($(CC_NAME), suncc) +- CFLAGS= -g $(PROFILE) ++ CFLAGS+= $(PROFILE) + LDFLAGS+=-g $(PROFILE) + MOD_LDFLAGS=-G $(LDFLAGS) + endif +@@ -958,7 +958,7 @@ + found_lock_method=yes + LIBS= -pthread -lfl #dlopen is in libc + else +- LIBS= -lfl #dlopen is in libc ++ LIBS= -lfl -L$(LOCALBASE)/lib -lsiplog #dlopen is in libc + endif + YACC=yacc + endif |