[Pkg-voip-commits] r2505 - openser/trunk/debian

[Julien Blache]

Author: jblache
Date: 2006-10-08 10:13:54 +0000 (Sun, 08 Oct 2006)
New Revision: 2505

Modified:
   openser/trunk/debian/changelog
   openser/trunk/debian/rules
Log:
Temporarily build at -O1 on arm, as a workaround for #390694 (#390005).


Modified: openser/trunk/debian/changelog
===================================================================
--- openser/trunk/debian/changelog	2006-10-08 08:50:18 UTC (rev 2504)
+++ openser/trunk/debian/changelog	2006-10-08 10:13:54 UTC (rev 2505)
@@ -1,13 +1,13 @@
-openser (1.1.0-4) UNRELEASED; urgency=low
+openser (1.1.0-4) unstable; urgency=low
 
-  * NOT RELEASED YET
-
   * debian/control:
     + openser-dbg is Priority: extra.
   * debian/patches/12_fail_on_build_failure.dpatch:
     + Added; abort the build if a module fails to build.
+  * debian/rules:
+    + Temporarily decrease optimisation on arm (closes: #390005).
 
- -- Julien BLACHE <jblache at debian.org>  Mon,  2 Oct 2006 20:55:10 +0200
+ -- Julien BLACHE <jblache at debian.org>  Sun,  8 Oct 2006 12:11:55 +0200
 
 openser (1.1.0-3) unstable; urgency=low
 

Modified: openser/trunk/debian/rules
===================================================================
--- openser/trunk/debian/rules	2006-10-08 08:50:18 UTC (rev 2504)
+++ openser/trunk/debian/rules	2006-10-08 10:13:54 UTC (rev 2505)
@@ -2,6 +2,8 @@
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+
 ALL_PACKAGES = openser openser-mysql-module openser-postgres-module \
 	openser-jabber-module openser-cpl-module openser-radius-modules \
 	openser-unixodbc-module
@@ -51,7 +53,7 @@
 RADIUS_MOD_PATH=$(addprefix modules/, $(RADIUS_MODULES))
 
 ifeq (cc, $(CC))
-CC = gcc
+	CC = gcc
 endif
 
 CFLAGS = -Wall -g
@@ -59,7 +61,11 @@
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
         CFLAGS += -O0
 else
-        CFLAGS += -O2
+	ifeq (amd64, $(DEB_HOST_ARCH))
+		CFLAGS += -O1
+	else
+		CFLAGS += -O2
+	endif
 endif
 
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))