Browse code

- added Conflicts to deb & rpm-4.0 spec (not tested yet) - version chg. to 0.8.11pre30

Andrei Pelinescu-Onciul authored on 06/06/2003 12:20:05
Showing 5 changed files
... ...
@@ -23,6 +23,7 @@
23 23
 #  2003-05-23  check if this makefile was already included (andrei)
24 24
 #              removed -DDIGEST_DOMAIN (andrei)
25 25
 #  2003-05-30  added extra_defs (andrei)
26
+#  2003-06-06  moved compiler detection before DEFS (andrei)
26 27
 
27 28
 
28 29
 # check if already included/exported
... ...
@@ -124,6 +125,63 @@ YACC := $(shell echo "$${YACC}")
124 124
 
125 125
 
126 126
 
127
+# find compiler name & version
128
+ifeq ($(CC),)
129
+	CC=gcc
130
+endif
131
+LD= $(CC)
132
+CC_LONGVER=$(shell if  $(CC) -v 2>/dev/null; then \
133
+						$(CC) -v 2>&1 ;\
134
+					else \
135
+						$(CC) -V 2>&1 ; \
136
+					fi )
137
+MKTAGS=ctags -R .
138
+
139
+#find-out the compiler's name
140
+
141
+ifneq (,$(findstring gcc, $(CC_LONGVER)))
142
+	CC_NAME=gcc
143
+	CC_VER=$(CC) $(shell $(CC) --version|head -1| \
144
+				 sed -e 's/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/' -e 's/[^0-9]*\([0-9][0-9]*\.[0-9][0-9]*\).*/\1/')
145
+	# sun sed is a little brain damaged => this complicated expression
146
+	MKDEP=$(CC) -MM 
147
+	#transform gcc version into 2.9x or 3.0
148
+	CC_SHORTVER=$(shell echo "$(CC_VER)" | cut -d" " -f 2| \
149
+				 sed -e 's/[^0-9]*-\(.*\)/\1/'| \
150
+				 sed -e 's/2\.9.*/2.9x/' -e 's/3\..\..*/3.0/' -e \
151
+				 	's/3\../3.0/')
152
+endif
153
+
154
+ifneq (, $(findstring Sun, $(CC_LONGVER)))
155
+	CC_NAME=suncc
156
+	CC_SHORTVER=$(shell echo "$(CC_LONGVER)"|head -1| \
157
+					sed -e 's/.*\([0-9]\.[0-9]\).*/\1/g' )
158
+	CC_VER=$(CC) $(CC_SHORTVER)
159
+	MKDEP=$(CC) -xM1 
160
+endif
161
+
162
+ifneq (, $(findstring Intel(R) C++ Compiler, $(CC_LONGVER)))
163
+	# very nice: gcc compatible
164
+	CC_NAME=icc
165
+	CC_FULLVER=$(shell echo "$(CC_LONGVER)"|head -1| \
166
+					sed -e 's/.*Version \([0-9]\.[0-9]\.[0-9]*\).*/\1/g' )
167
+	CC_SHORTVER=$(shell echo "$(CC_FULLVER)" | cut -d. -f1,2 )
168
+	CC_VER=$(CC) $(CC_FULLVER)
169
+	MKDEP=$(CC) -MM 
170
+endif
171
+
172
+
173
+ifeq (,$(CC_NAME))
174
+#not found
175
+	CC_NAME=$(CC)
176
+	CC_SHORTVER=unknown
177
+	CC_VER=unknown
178
+	MKDEP=gcc -MM 
179
+$(warning	Unknown compiler $(CC)\; supported compilers: \
180
+			gcc, sun cc, intel icc )
181
+endif
182
+
183
+
127 184
 # compile-time options
128 185
 #
129 186
 # -DSTATS
... ...
@@ -239,63 +297,6 @@ endif
239 239
 
240 240
 # platform dependent settings
241 241
 
242
-
243
-#common
244
-ifeq ($(CC),)
245
-	CC=gcc
246
-endif
247
-LD= $(CC)
248
-CC_LONGVER=$(shell if  $(CC) -v 2>/dev/null; then \
249
-						$(CC) -v 2>&1 ;\
250
-					else \
251
-						$(CC) -V 2>&1 ; \
252
-					fi )
253
-MKTAGS=ctags -R .
254
-
255
-#find-out the compiler's name
256
-
257
-ifneq (,$(findstring gcc, $(CC_LONGVER)))
258
-	CC_NAME=gcc
259
-	CC_VER=$(CC) $(shell $(CC) --version|head -1| \
260
-				 sed -e 's/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/' -e 's/[^0-9]*\([0-9][0-9]*\.[0-9][0-9]*\).*/\1/')
261
-	# sun sed is a little brain damaged => this complicated expression
262
-	MKDEP=$(CC) -MM 
263
-	#transform gcc version into 2.9x or 3.0
264
-	CC_SHORTVER=$(shell echo "$(CC_VER)" | cut -d" " -f 2| \
265
-				 sed -e 's/[^0-9]*-\(.*\)/\1/'| \
266
-				 sed -e 's/2\.9.*/2.9x/' -e 's/3\..\..*/3.0/' -e \
267
-				 	's/3\../3.0/')
268
-endif
269
-
270
-ifneq (, $(findstring Sun, $(CC_LONGVER)))
271
-	CC_NAME=suncc
272
-	CC_SHORTVER=$(shell echo "$(CC_LONGVER)"|head -1| \
273
-					sed -e 's/.*\([0-9]\.[0-9]\).*/\1/g' )
274
-	CC_VER=$(CC) $(CC_SHORTVER)
275
-	MKDEP=$(CC) -xM1 
276
-endif
277
-
278
-ifneq (, $(findstring Intel(R) C++ Compiler, $(CC_LONGVER)))
279
-	# very nice: gcc compatible
280
-	CC_NAME=icc
281
-	CC_FULLVER=$(shell echo "$(CC_LONGVER)"|head -1| \
282
-					sed -e 's/.*Version \([0-9]\.[0-9]\.[0-9]*\).*/\1/g' )
283
-	CC_SHORTVER=$(shell echo "$(CC_FULLVER)" | cut -d. -f1,2 )
284
-	CC_VER=$(CC) $(CC_FULLVER)
285
-	MKDEP=$(CC) -MM 
286
-endif
287
-
288
-
289
-ifeq (,$(CC_NAME))
290
-#not found
291
-	CC_NAME=$(CC)
292
-	CC_SHORTVER=unknown
293
-	CC_VER=unknown
294
-	MKDEP=gcc -MM 
295
-$(warning	Unknown compiler $(CC)\; supported compilers: \
296
-			gcc, sun cc, intel icc )
297
-endif
298
-
299 242
 # find ld & as name (gnu or solaris)
300 243
 ifeq ($(ARCH), sparc64)
301 244
 ifeq ($(CC_NAME), gcc)
... ...
@@ -3,7 +3,7 @@ $Id$
3 3
 ( - todo, x - done)
4 4
 
5 5
 release:
6
-- fix CC_VER bug in newer Makefile (move DEFS after CC?)
6
+x fix CC_VER bug in newer Makefile (move DEFS after CC?)
7 7
 x openbsd 3.2 packages -> doc in share/doc (and not in doc)
8 8
 - openbsd 3.2 -> add jabber and mysql to the package
9 9
 x fix modules makefiles (so that cd modules/foo; make will also link the proper
... ...
@@ -1,3 +1,11 @@
1
+ser (0.8.11-pre30) unstable; urgency=low
2
+
3
+  * minor bugfixes
4
+
5
+  * debian packaging changes (added conflicts)
6
+
7
+ -- Andrei Pelinescu-Onciul <pelinescu-onciul@fokus.fraunhofer.de>  Fri, 06 Jun 2003 14:03:29 +0200
8
+
1 9
 ser (0.8.11-pre29) unstable; urgency=low
2 10
 
3 11
   * RFC3261 support (TCP, loose routing)
... ...
@@ -9,6 +9,7 @@ Package: ser
9 9
 Architecture: any
10 10
 Depends: ${shlibs:Depends}
11 11
 Suggests: ser-mysql-module, ser-jabber-module
12
+Conflicts: ser-mysql-module (< ${Source-Version}), ser-jabber-module (< ${Source-Version}), ser-radius-modules (< ${Source-Version})
12 13
 Description: Sip Express Router, very fast and configurable SIP proxy
13 14
  ser or SIP Express Router is a very fast and flexible SIP (RFC3621)
14 15
  proxy server. Written entirely in C, ser can handle thousands calls
... ...
@@ -1,6 +1,6 @@
1 1
 %define name    ser
2
-%define ver     0.8.11pre29
3
-%define rel     1
2
+%define ver     0.8.11pre30
3
+%define rel     0
4 4
 
5 5
 %define EXCLUDED_MODULES	mysql jabber auth_radius group_radius uri_radius postgress snmp cpl cpl-c ext extcmd mangler pdt
6 6
 %define MYSQL_MODULES		mysql
... ...
@@ -20,6 +20,7 @@ Source2:      ser.init
20 20
 URL:          http://iptel.org/ser
21 21
 Vendor:       FhG Fokus
22 22
 BuildRoot:    /var/tmp/%{name}-%{ver}-root
23
+Conflicts:    ser-mysql < %ver, ser-jabber < %ver, ser-radius < %ver
23 24
 BuildPrereq:  make flex bison
24 25
 
25 26
 
... ...
@@ -232,6 +233,9 @@ fi
232 232
 
233 233
 %changelog
234 234
 
235
+* Fri Jun 6 2003 Andrei Pelinescu - Onciul <pelinescu-onciul@fokus.fraunhofer.de>
236
+- added Conflicts:, changed vesion to 0.8.11pre30
237
+
235 238
 * Mon Jun 2 2003 Daniel-Constantin Mierla <mierla@fokus.fraunhofer.de>
236 239
 - added README files for ser-jabber and ser-radius packages
237 240
 - spec file updated to work with rpm v4.1+