Package: opensips / 2.2.2-3.1

fix-forced-usrlocal.patch Patch series | download
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
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
Description: remove forced include paths from Makefile to properly build
 modules on kfreebsd.
Author: Răzvan Crainea <razvan@opensips.org>
Last-Update: 2016-12-08
--- a/modules/db_unixodbc/Makefile
+++ b/modules/db_unixodbc/Makefile
@@ -6,11 +6,8 @@
 auto_gen=
 NAME=db_unixodbc.so
 
-# sql.h locations (freebsd,openbsd  solaris)
-DEFS += -I$(LOCALBASE)/include -I$(LOCALBASE)/include/odbc
-
 # libodbc locations on RH/Suse, Solaris /OpenBSD, FreeBSD
 # (Debian does the right thing and puts it in /usr/lib)
-LIBS= -L$(LOCALBASE)/lib -lodbc
+LIBS= -lodbc
 
 include ../../Makefile.modules
--- a/modules/auth_aaa/Makefile
+++ b/modules/auth_aaa/Makefile
@@ -8,7 +8,6 @@
 include ../../Makefile.defs
 auto_gen=
 NAME=auth_aaa.so
-DEFS+=-I$(LOCALBASE)/include
 LIBS=
 
 include ../../Makefile.modules
--- a/modules/cachedb_memcached/Makefile
+++ b/modules/cachedb_memcached/Makefile
@@ -8,7 +8,6 @@
 include ../../Makefile.defs
 auto_gen=
 NAME=cachedb_memcached.so
-DEFS+=-I$(LOCALBASE)/include
-LIBS=-L$(LOCALBASE)/lib -lmemcached
+LIBS=-lmemcached
 
 include ../../Makefile.modules
--- a/modules/cachedb_redis/Makefile
+++ b/modules/cachedb_redis/Makefile
@@ -9,7 +9,6 @@
 auto_gen=
 NAME=cachedb_redis.so
 
-DEFS+=-I$(LOCALBASE)/include
-LIBS=-L$(LOCALBASE)/lib -lhiredis
+LIBS=-lhiredis
 
 include ../../Makefile.modules
--- a/modules/db_berkeley/Makefile
+++ b/modules/db_berkeley/Makefile
@@ -16,18 +16,10 @@
 SCRIPTS_DIR?=../../scripts/
 UTILS_DIR?=../../utils/
 
-DEFS +=-I$(LOCALBASE)/include -I$(LOCALBASE)/BerkeleyDB.4.6/include \
-	-I$(SYSBASE)/include -I$(LOCALBASE)/include/db46 
+# bsd also ported to ldb
+DB_LIB?=ldb
 
-IS_BSD= $(shell echo "$(OS)" | sed -e 's/^.*bsd/yes/i' )
-ifeq ($(IS_BSD), yes)
-	DB_LIB=ldb-4.6
-else
-	DB_LIB=ldb
-endif
-
-LIBS=-L$(LOCALBASE)/lib -L$(SYSBASE)/lib -L$(LOCALBASE)/BerkeleyDB.4.6/lib \
-		-$(DB_LIB)
+LIBS=-$(DB_LIB)
 
 include ../../Makefile.modules
 
--- a/modules/jabber/Makefile
+++ b/modules/jabber/Makefile
@@ -14,7 +14,6 @@
 # -DHAVE_IHTTP
 
 # expat.h location
-DEFS+=-I$(LOCALBASE)/include
-LIBS=-L$(LOCALBASE)/lib -lexpat
+LIBS=-lexpat
 
 include ../../Makefile.modules
--- a/modules/lua/Makefile
+++ b/modules/lua/Makefile
@@ -11,8 +11,8 @@
 ifeq (,$(findstring -l,$(LIB_LUA)))
 LIB_LUA = -llua
 endif
-DEFS += $(shell $(MYSQLCFG) --include | sed 's/\(-I.*\)\/mysql/\1/g' ) -I/usr/include/lua5.1/ -I$(LOCALBASE)/include/memcached
-LIBS += $(shell $(MYSQLCFG) --libs) -L/usr/lib/ -L/usr/local/lib/ -lmemcached $(LIB_LUA)
+DEFS += $(shell $(MYSQLCFG) --include | sed 's/\(-I.*\)\/mysql/\1/g' ) -I/usr/include/lua5.1/
+LIBS += $(shell $(MYSQLCFG) --libs) -lmemcached $(LIB_LUA)
 
 include ../../Makefile.modules
 
--- a/modules/mmgeoip/Makefile
+++ b/modules/mmgeoip/Makefile
@@ -27,7 +27,5 @@
 include ../../Makefile.defs
 auto_gen=
 NAME=mmgeoip.so
-#LIBS+=-lGeoIP
-LIBS=-L$(LOCALBASE)/lib -lGeoIP
-DEFS+=-I$(LOCALBASE)/include
+LIBS+=-lGeoIP
 include ../../Makefile.modules
--- a/modules/peering/Makefile
+++ b/modules/peering/Makefile
@@ -7,7 +7,7 @@
 include ../../Makefile.defs
 auto_gen=
 NAME=peering.so
-DEFS+= -DWITH_RADIUS_SUPPORT -I$(LOCALBASE)/include
+DEFS+= -DWITH_RADIUS_SUPPORT
 LIBS=
 
 include ../../Makefile.modules
--- a/modules/presence/Makefile
+++ b/modules/presence/Makefile
@@ -9,8 +9,7 @@
 auto_gen=
 NAME=presence.so
 
-DEFS+=-I$(SYSBASE)/include/libxml2 -I$(LOCALBASE)/include/libxml2 \
-      -I$(LOCALBASE)/include
-LIBS=-L$(SYSBASE)/include/lib  -L$(LOCALBASE)/lib -lxml2
+DEFS+=-I$(SYSBASE)/include/libxml2
+LIBS=-lxml2
 
 include ../../Makefile.modules
--- a/modules/presence_xml/Makefile
+++ b/modules/presence_xml/Makefile
@@ -1,16 +1,13 @@
 # $Id$
 #
-# Presence_XML 
-# 
-# 
+# Presence_XML
+#
 # WARNING: do not run this directly, it should be run by the master Makefile
 
 include ../../Makefile.defs
 auto_gen=
 NAME=presence_xml.so
-
-DEFS+=-I$(SYSBASE)/include/libxml2 -I$(LOCALBASE)/include/libxml2 \
-      -I$(LOCALBASE)/include
-LIBS=-L$(SYSBASE)/include/lib  -L$(LOCALBASE)/lib -lxml2
+DEFS+=-I$(SYSBASE)/include/libxml2
+LIBS=-lxml2
 
 include ../../Makefile.modules
--- a/modules/pua_dialoginfo/Makefile
+++ b/modules/pua_dialoginfo/Makefile
@@ -2,15 +2,12 @@
 #
 # PUBLISH
 #
-# 
 # WARNING: do not run this directly, it should be run by the master Makefile
 
 include ../../Makefile.defs
 auto_gen=
 NAME=pua_dialoginfo.so
-
-DEFS+=-I$(SYSBASE)/include/libxml2 -I$(LOCALBASE)/include/libxml2 \
-      -I$(LOCALBASE)/include
-LIBS=-L$(SYSBASE)/include/lib  -L$(LOCALBASE)/lib -lxml2
+DEFS+=-I$(SYSBASE)/include/libxml2
+LIBS=-lxml2
 
 include ../../Makefile.modules
--- a/modules/xmpp/Makefile
+++ b/modules/xmpp/Makefile
@@ -12,7 +12,6 @@
 LIBS=
 
 # expat.h location
-DEFS += -I$(LOCALBASE)/include
-LIBS  = -L$(LOCALBASE)/lib -lexpat
+LIBS = -lexpat
 
 include ../../Makefile.modules
--- a/modules/dns_cache/Makefile
+++ b/modules/dns_cache/Makefile
@@ -9,7 +9,4 @@
 auto_gen=
 NAME=dns_cache.so
 
-DEFS+=-I$(LOCALBASE)/include
-LIBS=-L$(LOCALBASE)/lib
-
 include ../../Makefile.modules
--- a/modules/event_rabbitmq/Makefile
+++ b/modules/event_rabbitmq/Makefile
@@ -14,8 +14,7 @@
 endif
 
 ifeq ($(RABBITMQ_BUILDER),)
-	DEFS+=-I$(LOCALBASE)/include
-	LIBS=-L$(LOCALBASE)/lib -lrabbitmq
+	LIBS=-lrabbitmq
 else
 	DEFS += $(shell $(RABBITMQ_BUILDER) --cflags)
 	LIBS += $(shell $(RABBITMQ_BUILDER) --libs)
--- a/utils/db_berkeley/Makefile
+++ b/utils/db_berkeley/Makefile
@@ -10,12 +10,7 @@
 
 include ../../Makefile.sources
 
-# if you want to tune or reset flags
-#DEFS:=-DEXTRA_DEBUG  -I$(LOCALBASE)/BerkeleyDB.4.6/include
-DEFS+=-I$(LOCALBASE)/include -I$(LOCALBASE)/BerkeleyDB.4.6/include \
-        -I$(SYSBASE)/include
-        
-LIBS=-L$(LOCALBASE)/lib -L$(SYSBASE)/lib -L$(LOCALBASE)/BerkeleyDB.4.6/lib -ldb
+LIBS=-ldb
 
 include ../../Makefile.rules