[Pkg-voip-commits] r4014 - in libpri/trunk/debian: . patches

[paravoid at alioth.debian.org]

Author: paravoid
Date: 2007-08-14 22:04:21 +0000 (Tue, 14 Aug 2007)
New Revision: 4014

Modified:
   libpri/trunk/debian/changelog
   libpri/trunk/debian/patches/bristuff.dpatch
   libpri/trunk/debian/patches/enable-gcc-optimizations.dpatch
   libpri/trunk/debian/patches/libname.dpatch
   libpri/trunk/debian/rules
Log:
(Almost) properly pass CFLAGS from debian/rules, including -O2

Modified: libpri/trunk/debian/changelog
===================================================================
--- libpri/trunk/debian/changelog	2007-08-14 19:57:43 UTC (rev 4013)
+++ libpri/trunk/debian/changelog	2007-08-14 22:04:21 UTC (rev 4014)
@@ -7,7 +7,7 @@
   * Conflict with libpri1.2 versions prior to 1.4.0-2 to ease transition for
     testing or unstable users. (Closes: #437804)
 
- -- Faidon Liambotis <paravoid at debian.org>  Tue, 14 Aug 2007 22:56:45 +0300
+ -- Faidon Liambotis <paravoid at debian.org>  Wed, 15 Aug 2007 01:02:07 +0300
 
 libpri (1.4.1-1) unstable; urgency=low
 

Modified: libpri/trunk/debian/patches/bristuff.dpatch
===================================================================
--- libpri/trunk/debian/patches/bristuff.dpatch	2007-08-14 19:57:43 UTC (rev 4013)
+++ libpri/trunk/debian/patches/bristuff.dpatch	2007-08-14 22:04:21 UTC (rev 4014)
@@ -359,8 +359,8 @@
  DYNAMIC_LIBRARY=libpri.so.1.0
  STATIC_OBJS=copy_string.o pri.o q921.o prisched.o q931.o pri_facility.o
  DYNAMIC_OBJS=copy_string.lo pri.lo q921.lo prisched.lo q931.lo pri_facility.lo
--CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -O2 $(ALERTING) $(LIBPRI_COUNTERS)
-+CFLAGS=-Wall -Wstrict-prototypes -Wmissing-prototypes -g -O2 $(ALERTING) $(LIBPRI_COUNTERS) $(LAYER2ALWAYSUP) $(FASTBUSYONBUSY) -DRELAX_TRB $(RELAXEDTIMERS)
+-CFLAGS+=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g $(ALERTING) $(LIBPRI_COUNTERS)
++CFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -g $(ALERTING) $(LIBPRI_COUNTERS) $(LAYER2ALWAYSUP) $(FASTBUSYONBUSY) -DRELAX_TRB $(RELAXEDTIMERS)
  INSTALL_PREFIX=$(DESTDIR)
  INSTALL_BASE=/usr
  SOFLAGS = -Wl,-hlibpri.so.1.0

Modified: libpri/trunk/debian/patches/enable-gcc-optimizations.dpatch
===================================================================
--- libpri/trunk/debian/patches/enable-gcc-optimizations.dpatch	2007-08-14 19:57:43 UTC (rev 4013)
+++ libpri/trunk/debian/patches/enable-gcc-optimizations.dpatch	2007-08-14 22:04:21 UTC (rev 4014)
@@ -2,7 +2,8 @@
 ## enable-gcc-optimizations.dpatch by Faidon Liambotis <paravoid at debian.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: Enable -O2 optimizations
+## DP: Don't discard CFLAGS of the environment
+## DP: debian/rules passes at least the optimization level
 
 @DPATCH@
 diff -urNad libpri-1.4.1~/Makefile libpri-1.4.1/Makefile
@@ -13,7 +14,7 @@
  STATIC_OBJS=copy_string.o pri.o q921.o prisched.o q931.o pri_facility.o
  DYNAMIC_OBJS=copy_string.lo pri.lo q921.lo prisched.lo q931.lo pri_facility.lo
 -CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g $(ALERTING) $(LIBPRI_COUNTERS)
-+CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -O2 $(ALERTING) $(LIBPRI_COUNTERS)
++CFLAGS+=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g $(ALERTING) $(LIBPRI_COUNTERS)
  INSTALL_PREFIX=$(DESTDIR)
  INSTALL_BASE=/usr
  SOFLAGS = -Wl,-hlibpri.so.1.0

Modified: libpri/trunk/debian/patches/libname.dpatch
===================================================================
--- libpri/trunk/debian/patches/libname.dpatch	2007-08-14 19:57:43 UTC (rev 4013)
+++ libpri/trunk/debian/patches/libname.dpatch	2007-08-14 22:04:21 UTC (rev 4014)
@@ -26,7 +26,7 @@
 +DYNAMIC_LIBRARY=lib$(LIBNAME).so.1.0
  STATIC_OBJS=copy_string.o pri.o q921.o prisched.o q931.o pri_facility.o
  DYNAMIC_OBJS=copy_string.lo pri.lo q921.lo prisched.lo q931.lo pri_facility.lo
- CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -O2 $(ALERTING) $(LIBPRI_COUNTERS)
+ CFLAGS+=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g $(ALERTING) $(LIBPRI_COUNTERS)
  INSTALL_PREFIX=$(DESTDIR)
  INSTALL_BASE=/usr
 -SOFLAGS = -Wl,-hlibpri.so.1.0

Modified: libpri/trunk/debian/rules
===================================================================
--- libpri/trunk/debian/rules	2007-08-14 19:57:43 UTC (rev 4013)
+++ libpri/trunk/debian/rules	2007-08-14 22:04:21 UTC (rev 4014)
@@ -62,9 +62,9 @@
 	dh_testdir
 	
 	# Add here commands to compile the package.
-	$(MAKE)
+	CFLAGS="$(CFLAGS)" $(MAKE)
 ifeq ($(USE_BRISTUFF),1)
-	cd $(BRISTUFF_DIR); make LIB_SUF=bristuffed
+	cd $(BRISTUFF_DIR); CFLAGS="$(CFLAGS)" $(MAKE) LIB_SUF=bristuffed
 endif
 	
 	touch build-stamp