[Pkg-voip-commits] r10523 - in /iaxmodem/trunk/debian: changelog patches/build_flags.patch patches/series

[tzafrir at alioth.debian.org]

Author: tzafrir
Date: Sat Jul 26 19:23:37 2014
New Revision: 10523

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=10523
Log:
uild_flags.patch: pass flags from dpkg-buildflags.

Added:
    iaxmodem/trunk/debian/patches/build_flags.patch
Modified:
    iaxmodem/trunk/debian/changelog
    iaxmodem/trunk/debian/patches/series

Modified: iaxmodem/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/iaxmodem/trunk/debian/changelog?rev=10523&op=diff
==============================================================================
--- iaxmodem/trunk/debian/changelog	(original)
+++ iaxmodem/trunk/debian/changelog	Sat Jul 26 19:23:37 2014
@@ -8,6 +8,7 @@
   * Update VCS fields.
   * Convert to dh.
   * Explicit [L]GPL-2 in debian/copyright.
+  * uild_flags.patch: pass flags from dpkg-buildflags.
 
  -- Tzafrir Cohen <tzafrir at debian.org>  Fri, 16 Sep 2011 22:03:26 +0300
 

Added: iaxmodem/trunk/debian/patches/build_flags.patch
URL: http://svn.debian.org/wsvn/pkg-voip/iaxmodem/trunk/debian/patches/build_flags.patch?rev=10523&op=file
==============================================================================
--- iaxmodem/trunk/debian/patches/build_flags.patch	(added)
+++ iaxmodem/trunk/debian/patches/build_flags.patch	Sat Jul 26 19:23:37 2014
@@ -0,0 +1,24 @@
+From: Tzafrir Cohen <tzafrir at debian.org>
+Description: Pass hardening flags from dpkg
+
+dpkg-buildflags sets CFLAGS, CPPFLAGS and LDFLAGS. Pass them to the
+build process.
+
+--- a/build
++++ b/build
+@@ -43,12 +43,12 @@ if [ "$1" = "static" ]; then
+     fi
+ 
+     getVersions && \
+-    gcc -Wall -g $PTYUSE $CFLAGS -DMODEMVER=\"$MODEMVER\" -DDSPVER=\"$DSPVER\" -DIAXVER=\"$IAXVER\" -DSTATICLIBS \
++    gcc -Wall -g $PTYUSE $CPPFLAGS $CFLAGS -DMODEMVER=\"$MODEMVER\" -DDSPVER=\"$DSPVER\" -DIAXVER=\"$IAXVER\" -DSTATICLIBS \
+ 	-std=c99 -Ilib/libiax2/src -Ilib/spandsp/src -c -o iaxmodem.o iaxmodem.c && \
+-    gcc -o iaxmodem iaxmodem.o lib/spandsp/src/.libs/libspandsp.a lib/libiax2/src/.libs/libiax.a -lm $LLIBS
++    gcc $LDFLAGS -o iaxmodem iaxmodem.o lib/spandsp/src/.libs/libspandsp.a lib/libiax2/src/.libs/libiax.a -lm $LLIBS
+ else
+     getVersions && \
+-    gcc -Wall -g $PTYUSE -DMODEMVER=\"$MODEMVER\" -DDSPVER=\"$DSPVER\" -DIAXVER=\"$IAXVER\" \
++    gcc $LDFLAGS $CPPFLAGS $CFLAGS -Wall -g $PTYUSE -DMODEMVER=\"$MODEMVER\" -DDSPVER=\"$DSPVER\" -DIAXVER=\"$IAXVER\" \
+ 	-lm -liax -lutil -lspandsp -ltiff -o iaxmodem iaxmodem.c
+ fi
+ if [ -n "`ls /etc/iaxmodem-cfg.* 2>/dev/null`" ]; then

Modified: iaxmodem/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/iaxmodem/trunk/debian/patches/series?rev=10523&op=diff
==============================================================================
--- iaxmodem/trunk/debian/patches/series	(original)
+++ iaxmodem/trunk/debian/patches/series	Sat Jul 26 19:23:37 2014
@@ -1,2 +1,2 @@
 11_build_configure-stamp
-
+build_flags.patch