[Pkg-voip-commits] r2027 - iaxmodem/trunk/debian/patches

[Julien Blache]

Author: jblache
Date: 2006-07-08 10:26:12 +0000 (Sat, 08 Jul 2006)
New Revision: 2027

Modified:
   iaxmodem/trunk/debian/patches/11_build_configure-stamp.dpatch
Log:
Add patch description


Modified: iaxmodem/trunk/debian/patches/11_build_configure-stamp.dpatch
===================================================================
--- iaxmodem/trunk/debian/patches/11_build_configure-stamp.dpatch	2006-07-08 10:08:34 UTC (rev 2026)
+++ iaxmodem/trunk/debian/patches/11_build_configure-stamp.dpatch	2006-07-08 10:26:12 UTC (rev 2027)
@@ -2,32 +2,35 @@
 ## 11_build_configure-stamp.dpatch by  <jblache at debian.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: the build script should not build the libraries if configure-stamp exists
+## DP: debian/rules takes care of that.
 
 @DPATCH@
-diff -urNad iaxmodem-0.1.9.dfsg~/build iaxmodem-0.1.9.dfsg/build
---- iaxmodem-0.1.9.dfsg~/build	2006-06-12 17:03:49.000000000 +0200
-+++ iaxmodem-0.1.9.dfsg/build	2006-06-12 17:46:50.883762607 +0200
-@@ -12,13 +12,15 @@
+diff -urNad iaxmodem-0.1.10.dfsg~/build iaxmodem-0.1.10.dfsg/build
+--- iaxmodem-0.1.10.dfsg~/build	2006-07-08 12:08:58.000000000 +0200
++++ iaxmodem-0.1.10.dfsg/build	2006-07-08 12:13:30.026277394 +0200
+@@ -14,14 +14,16 @@
  fi
  
  if [ "$1" = "static" ]; then
 -    cd lib/libiax2 && \
--    ./configure && \
+-    ./configure --disable-shared && \
 -    make && \
 -    cd ../spandsp && \
--    ./configure && \
+-    ./configure --disable-shared && \
 -    make && \
 -    cd ../.. && \
+-    gcc -Wall -g -DMODEMVER=\"$MODEMVER\" -DDSPVER=\"$DSPVER\" -DIAXVER=\"$IAXVER\" -DSTATICLIBS -D_GNU_SOURCE \
 +    if [ ! -e configure-stamp ]; then
 +	cd lib/libiax2 && \
-+	    ./configure && \
++	    ./configure --disable-shared && \
 +	    make && \
 +	    cd ../spandsp && \
-+	    ./configure && \
++	    ./configure --disable-shared && \
 +	    make && \
-+	    cd ../.. || exit 1
++	    cd ../..
 +    fi
-     gcc -Wall -O2 -g -DMODEMVER=\"$MODEMVER\" -DDSPVER=\"$DSPVER\" -DIAXVER=\"$IAXVER\" -DSTATICLIBS -D_GNU_SOURCE \
++    gcc -Wall -g -O2 -DMODEMVER=\"$MODEMVER\" -DDSPVER=\"$DSPVER\" -DIAXVER=\"$IAXVER\" -DSTATICLIBS -D_GNU_SOURCE \
  	-std=c99 -Ilib/libiax2/src -Ilib/spandsp/src -c -o iaxmodem.o iaxmodem.c && \
      gcc -lm -lutil -ltiff -o iaxmodem iaxmodem.o lib/spandsp/src/.libs/libspandsp.a lib/libiax2/src/.libs/libiax.a
+ else