[Pkg-voip-commits] r8415 - /libpri/trunk/debian/patches/enable-gcc-optimizations

[paravoid at alioth.debian.org]

Author: paravoid
Date: Thu May 27 01:20:02 2010
New Revision: 8415

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=8415
Log:
Properly fix enable-gcc-optimizations

Modified:
    libpri/trunk/debian/patches/enable-gcc-optimizations

Modified: libpri/trunk/debian/patches/enable-gcc-optimizations
URL: http://svn.debian.org/wsvn/pkg-voip/libpri/trunk/debian/patches/enable-gcc-optimizations?rev=8415&op=diff
==============================================================================
--- libpri/trunk/debian/patches/enable-gcc-optimizations (original)
+++ libpri/trunk/debian/patches/enable-gcc-optimizations Thu May 27 01:20:02 2010
@@ -1,5 +1,5 @@
-Don't discard CFLAGS of the environment
-debian/rules passes at least the optimization level
+Don't discard CFLAGS of the environment and turn off all optimizations as
+those are handled by our build system.
 
 Author: Faidon Liambotis <paravoid at debian.org>
 
@@ -10,7 +10,24 @@
  	rose_qsig_name.lo \
  	version.lo
 -CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_COUNTERS) $(LIBPRI_OPT)
-+CFLAGS += -Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_COUNTERS) $(LIBPRI_OPT)
++CFLAGS += -Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_COUNTERS)
  INSTALL_PREFIX=$(DESTDIR)
  INSTALL_BASE=/usr
  libdir?=$(INSTALL_BASE)/lib
+@@ -109,16 +109,6 @@
+ 
+ PRIVERSION:=$(shell GREP=$(GREP) AWK=$(AWK) build_tools/make_version .)
+ 
+-#The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only.
+-#This works for even old (2.96) versions of gcc and provides a small boost either way.
+-#A ultrasparc cpu is really v9 but the stock debian stable 3.0 gcc doesnt support it.
+-ifeq ($(PROC),sparc64)
+-PROC=ultrasparc
+-LIBPRI_OPT = -mtune=$(PROC) -O3 -pipe -fomit-frame-pointer -mcpu=v8
+-else
+-LIBPRI_OPT = -O2
+-endif
+-
+ ifeq ($(CPUARCH),i686)
+ CFLAGS += -m32
+ SOFLAGS += -m32