[Pkg-voip-commits] r6793 - in /iaxmodem/trunk/debian: changelog patches/11_build_configure-stamp.dpatch
jblache at alioth.debian.org
jblache at alioth.debian.org
Sun Feb 22 10:55:42 UTC 2009
Author: jblache
Date: Sun Feb 22 10:55:42 2009
New Revision: 6793
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6793
Log:
Don't link with unneeded libraries.
Modified:
iaxmodem/trunk/debian/changelog
iaxmodem/trunk/debian/patches/11_build_configure-stamp.dpatch
Modified: iaxmodem/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/iaxmodem/trunk/debian/changelog?rev=6793&op=diff
==============================================================================
--- iaxmodem/trunk/debian/changelog (original)
+++ iaxmodem/trunk/debian/changelog Sun Feb 22 10:55:42 2009
@@ -4,8 +4,10 @@
* debian/patches/01_seteuid_setegid_ordering.dpatch:
+ Removed; merged upstream.
-
- -- Julien BLACHE <jblache at debian.org> Sat, 21 Feb 2009 22:38:00 +0100
+ * debian/patches/11_build_configure-stamp.dpatch:
+ + Updated; do not link unneeded libraries.
+
+ -- Julien BLACHE <jblache at debian.org> Sun, 22 Feb 2009 11:45:40 +0100
iaxmodem (1.1.1~dfsg-3) unstable; urgency=low
Modified: iaxmodem/trunk/debian/patches/11_build_configure-stamp.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/iaxmodem/trunk/debian/patches/11_build_configure-stamp.dpatch?rev=6793&op=diff
==============================================================================
--- iaxmodem/trunk/debian/patches/11_build_configure-stamp.dpatch (original)
+++ iaxmodem/trunk/debian/patches/11_build_configure-stamp.dpatch Sun Feb 22 10:55:42 2009
@@ -2,14 +2,34 @@
## 11_build_configure-stamp.dpatch by <jblache at debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
-## DP: the build script should not build the libraries if configure-stamp exists
+## DP: The build script should not build the libraries if configure-stamp exists
## DP: debian/rules takes care of that.
+## DP: Do not link unneeded libraries:
+## DP: - -lutil is only needed if legacy PTYs are used
+## DP: - -ltiff is not needed at all (pulled in for spandsp, but
+## DP: tiff-dependent code in spandsp is not used by iaxmodem and not
+## DP: linked in the final binary)
@DPATCH@
-diff -urNad iaxmodem-0.3.2~dfsg~/build iaxmodem-0.3.2~dfsg/build
---- iaxmodem-0.3.2~dfsg~/build 2007-10-12 13:20:48.000000000 +0300
-+++ iaxmodem-0.3.2~dfsg/build 2007-10-12 15:45:59.000000000 +0300
-@@ -31,19 +31,16 @@
+diff -urNad iaxmodem-1.2.0~dfsg~/build iaxmodem-1.2.0~dfsg/build
+--- iaxmodem-1.2.0~dfsg~/build 2009-02-21 19:57:52.000000000 +0100
++++ iaxmodem-1.2.0~dfsg/build 2009-02-22 11:41:49.107062425 +0100
+@@ -16,12 +16,13 @@
+ }
+
+ PTYUSE="-DUSE_UNIX98_PTY"
++LLIBS=
+ if [ "$1" = "-bsdptys" ]; then
+ PTYUSE=""
++ LLIBS="-lutil"
+ shift
+ fi
+
+-LLIBS="-lutil"
+ if [ "`uname`" = "SunOS" ]; then
+ PATH=$PATH:/usr/sfw/bin; export PATH
+ MAKE="gmake"; export MAKE
+@@ -31,23 +32,20 @@
fi
if [ "$1" = "static" ]; then
@@ -39,3 +59,8 @@
getVersions && \
gcc -Wall -g $PTYUSE $CFLAGS -DMODEMVER=\"$MODEMVER\" -DDSPVER=\"$DSPVER\" -DIAXVER=\"$IAXVER\" -DSTATICLIBS \
-std=c99 -Ilib/libiax2/src -Ilib/spandsp/src -c -o iaxmodem.o iaxmodem.c && \
+- gcc -lm $LLIBS -ltiff -o iaxmodem iaxmodem.o lib/spandsp/src/.libs/libspandsp.a lib/libiax2/src/.libs/libiax.a
++ gcc -lm $LLIBS -o iaxmodem iaxmodem.o lib/spandsp/src/.libs/libspandsp.a lib/libiax2/src/.libs/libiax.a
+ else
+ getVersions && \
+ gcc -Wall -g $PTYUSE -DMODEMVER=\"$MODEMVER\" -DDSPVER=\"$DSPVER\" -DIAXVER=\"$IAXVER\" \
More information about the Pkg-voip-commits
mailing list