From 62f6fd78bba327abe7e10f34402d4e9abe07b92e Mon Sep 17 00:00:00 2001
From: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
Date: Fri, 3 Jul 2009 16:26:07 -0400
Subject: [PATCH] [#1759] Use optimization level 0 for repository, 2 for
packages
---
sflphone-client-gnome/configure.ac | 4 ++--
sflphone-common/configure.ac | 3 ++-
.../build-system/distributions/mandriva/sflphone-common.spec | 2 +-
.../build-system/distributions/opensuse/sflphone-common.spec | 2 +-
.../distributions/ubuntu/debian-sflphone-common/rules | 2 +-
5 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/sflphone-client-gnome/configure.ac b/sflphone-client-gnome/configure.ac
index 1faa55dc8f..ed4dbaeb59 100644
--- a/sflphone-client-gnome/configure.ac
+++ b/sflphone-client-gnome/configure.ac
@@ -18,9 +18,9 @@ AC_ARG_WITH(debug,
[with_debug=no]
)
if test "x$with_debug" = "xfull" -o "x$with_debug" = "xyes"; then
- CFLAGS="$CFLAGS -g -O2 -DDEBUG -Wall -Wextra"
+ CFLAGS="-g -O0 -DDEBUG -Wall -Wextra"
else
- CFLAGS="$CFLAGS -g -Wall -O2"
+ CFLAGS="$CFLAGS"
fi
AC_PROG_CC
diff --git a/sflphone-common/configure.ac b/sflphone-common/configure.ac
index 103fb42273..cc0851b941 100644
--- a/sflphone-common/configure.ac
+++ b/sflphone-common/configure.ac
@@ -96,7 +96,8 @@ dnl Define C++ as default language
AC_LANG(C++)
dnl Setup C++ compiler flags
-CXXFLAGS="$CXXFLAGS $USE_EXCEPTIONS $USER_INCLUDES -O0 -g -Wno-return-type"
+CXXFLAGS="$CXXFLAGS $USE_EXCEPTIONS $USER_INCLUDES -g -Wno-return-type"
+dnl CXXFLAGS="$USE_EXCEPTIONS $USER_INCLUDES -O0 -g -Wno-return-type"
dnl Check for header files
AC_FUNC_ALLOCA
diff --git a/tools/build-system/distributions/mandriva/sflphone-common.spec b/tools/build-system/distributions/mandriva/sflphone-common.spec
index 11921a1d76..fd29c286f5 100644
--- a/tools/build-system/distributions/mandriva/sflphone-common.spec
+++ b/tools/build-system/distributions/mandriva/sflphone-common.spec
@@ -65,7 +65,7 @@ make dep
make clean
make
cd -
-./autogen.sh --prefix=%{_prefix}
+./autogen.sh --prefix=%{_prefix} CXXFLAGS=-O2
make -j
%install
diff --git a/tools/build-system/distributions/opensuse/sflphone-common.spec b/tools/build-system/distributions/opensuse/sflphone-common.spec
index cb92f42505..662db2a52b 100644
--- a/tools/build-system/distributions/opensuse/sflphone-common.spec
+++ b/tools/build-system/distributions/opensuse/sflphone-common.spec
@@ -64,7 +64,7 @@ make dep
make clean
make
cd -
-./autogen.sh --prefix=%{_prefix}
+./autogen.sh --prefix=%{_prefix} CXXFLAGS=-O2
make -j
%install
diff --git a/tools/build-system/distributions/ubuntu/debian-sflphone-common/rules b/tools/build-system/distributions/ubuntu/debian-sflphone-common/rules
index d7235ece2b..2c3de83130 100755
--- a/tools/build-system/distributions/ubuntu/debian-sflphone-common/rules
+++ b/tools/build-system/distributions/ubuntu/debian-sflphone-common/rules
@@ -20,7 +20,7 @@ configure: configure-stamp
configure-stamp:
dh_testdir
# Add here commands to configure the package.
- ./autogen.sh --prefix=/usr
+ ./autogen.sh --prefix=/usr CXXFLAGS=O2
cd libs/pjproject-1.0.2; ./autogen.sh --prefix=/usr
touch configure-stamp
--
GitLab