[Pkg-voip-commits] r1051 - in pwlib/trunk/debian: . patches

[Kilian Krause]

Author: kilian
Date: 2005-12-03 18:20:57 +0000 (Sat, 03 Dec 2005)
New Revision: 1051

Modified:
   pwlib/trunk/debian/patches/01_alpha.dpatch
   pwlib/trunk/debian/rules
Log:
make -O2 come from the proper file, not bogusly added to rules and appear as -Os -O2 in the cflags..


Modified: pwlib/trunk/debian/patches/01_alpha.dpatch
===================================================================
--- pwlib/trunk/debian/patches/01_alpha.dpatch	2005-12-03 18:15:56 UTC (rev 1050)
+++ pwlib/trunk/debian/patches/01_alpha.dpatch	2005-12-03 18:20:57 UTC (rev 1051)
@@ -23,10 +23,10 @@
 exit 0
 
 @DPATCH@
-diff -urNad /home/jose/devel/temp/pwlib-1.7.5/make/unix.mak pwlib-1.7.5/make/unix.mak
---- /home/jose/devel/temp/pwlib-1.7.5/make/unix.mak	2004-06-18 02:38:08.000000000 +0200
-+++ pwlib-1.7.5/make/unix.mak	2004-07-18 15:52:12.000000000 +0200
-@@ -392,7 +392,7 @@
+diff -urNad pwlib-1.8.7~/make/unix.mak pwlib-1.8.7/make/unix.mak
+--- pwlib-1.8.7~/make/unix.mak	2004-11-16 00:32:34.000000000 +0000
++++ pwlib-1.8.7/make/unix.mak	2005-12-03 18:19:05.000000000 +0000
+@@ -401,7 +401,7 @@
  
  ifeq ($(P_SHAREDLIB),1)
  ifndef PROG
@@ -35,7 +35,7 @@
  endif # PROG
  endif # P_SHAREDLIB
  
-@@ -540,7 +540,7 @@
+@@ -549,7 +549,7 @@
  ifndef P_SHAREDLIB
  P_SHAREDLIB=1
  ifndef PROG
@@ -44,3 +44,12 @@
  endif # PROG
  endif
  endif
+@@ -911,7 +911,7 @@
+ else
+ 
+ ifneq ($(OSTYPE),Darwin)
+-  OPTCCFLAGS	+= -Os 
++  OPTCCFLAGS	+= -O2 
+ else
+   OPTCCFLAGS	+= -O2
+ endif

Modified: pwlib/trunk/debian/rules
===================================================================
--- pwlib/trunk/debian/rules	2005-12-03 18:15:56 UTC (rev 1050)
+++ pwlib/trunk/debian/rules	2005-12-03 18:20:57 UTC (rev 1051)
@@ -18,8 +18,6 @@
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
        CFLAGS += -O0
-else
-       CFLAGS += -O2
 endif
 
 export CFLAGS