1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
|
$FreeBSD$
--- Makefile.defs.orig
+++ Makefile.defs
@@ -169,10 +169,11 @@
INSTALL-TOUCH = touch # used to create the file first (good to
# make solaris install work)
INSTALL-CFG = $(INSTALL) -m 644
-INSTALL-BIN = $(INSTALL) -m 755
-INSTALL-MODULES = $(INSTALL) -m 755
-INSTALL-DOC = $(INSTALL) -m 644
-INSTALL-MAN = $(INSTALL) -m 644
+INSTALL-BIN = $(BSD_INSTALL_PROGRAM)
+INSTALL-MODULES = $(BSD_INSTALL_PROGRAM)
+INSTALL-DOC = $(BSD_INSTALL_MAN)
+INSTALL-MAN = $(BSD_INSTALL_MAN)
+INSTALL-SCRIPT = $(BSD_INSTALL_SCRIPT)
#set some vars from the environment (and not make builtins)
CC := $(shell echo "$${CC}")
@@ -321,14 +322,14 @@
-DNAME='"$(MAIN_NAME)"' -DVERSION='"$(RELEASE)"' -DARCH='"$(ARCH)"' \
-DOS='"$(OS)"' -DCOMPILER='"$(CC_VER)"' -D__CPU_$(ARCH) -D__OS_$(OS) \
-DCFG_DIR='"$(cfg-target)"'\
- -DPKG_MALLOC \
-DSHM_MEM -DSHM_MMAP \
-DDNS_IP_HACK \
-DUSE_IPV6 \
-DUSE_MCAST \
-DUSE_TCP \
-DDISABLE_NAGLE \
- -DF_MALLOC \
+ #-DPKG_MALLOC \
+ #-DF_MALLOC \
#-DDBG_QM_MALLOC \
#-DDBG_F_MALLOC \
#-DNO_DEBUG \
@@ -464,8 +465,8 @@
found_lock_method=yes
endif
-CFLAGS=
-LDFLAGS=
+#CFLAGS=
+#LDFLAGS=
# setting CFLAGS
ifeq ($(mode), release)
#if i386
@@ -473,15 +474,14 @@
# 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 4.0+
ifeq ($(CC_SHORTVER), 4.x)
CPU ?= athlon64
CFLAGS+=-minline-all-stringops -malign-double \
-falign-loops \
- -ftree-vectorize \
- -mtune=$(CPU)
+ -ftree-vectorize
else
#if gcc 3.4+
ifeq ($(CC_SHORTVER), 3.4)
@@ -515,7 +515,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,
@@ -533,7 +533,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 4.0+
ifeq ($(CC_SHORTVER), 4.x)
@@ -575,7 +575,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,
@@ -593,7 +593,7 @@
#if gcc
ifeq ($(CC_NAME), gcc)
#common stuff
- CFLAGS=-g -O9 -funroll-loops $(PROFILE) \
+ CFLAGS+=-funroll-loops $(PROFILE) \
-Wall\
#-Wcast-align \
#-Wmissing-prototypes
@@ -667,7 +667,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 4.x+
ifeq ($(CC_SHORTVER), 4.x)
@@ -709,7 +709,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 4.0+
ifeq ($(CC_SHORTVER), 4.x)
@@ -751,7 +751,7 @@
# if gcc
ifeq ($(CC_NAME), gcc)
#common stuff
- CFLAGS= -mips2 -O9 -funroll-loops $(PROFILE) \
+ CFLAGS+= -mips2 -funroll-loops $(PROFILE) \
-Wall
#if gcc 4.0+
ifeq ($(CC_SHORTVER), 4.x)
@@ -932,7 +932,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
@@ -947,12 +947,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
@@ -1028,13 +1028,14 @@
ifeq ($(OS), freebsd)
DEFS+=-DHAVE_SOCKADDR_SA_LEN -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN \
- -DHAVE_SCHED_YIELD -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_CONNECT_ECONNRESET_BUG
+ -DHAVE_SCHED_YIELD -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_CONNECT_ECONNRESET_BUG \
+ -I$(LOCALBASE)/include
ifneq ($(found_lock_method), yes)
DEFS+= -DUSE_PTHREAD_MUTEX # try pthread sems
found_lock_method=yes
LIBS= -pthread -lfl #dlopen is in libc
else
- LIBS= -lfl #dlopen is in libc
+ LIBS= -lfl -L$(LOCALBASE)/lib #dlopen is in libc
endif
YACC=yacc
endif
|
