[SCM] swh-plugins/master: debian/patches/01-dont-use-march.diff: Don't patch configure, it's going to be regenerated by autoreconf.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Thu Dec 27 17:06:22 UTC 2012


The following commit has been merged in the master branch:
commit 812606b7005fe42b6ff0cf021fccb69ba820012b
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu Dec 27 16:55:27 2012 +0000

    debian/patches/01-dont-use-march.diff: Don't patch configure, it's going to be regenerated by autoreconf.

diff --git a/debian/patches/01-dont-use-march.diff b/debian/patches/01-dont-use-march.diff
index 090059f..77f7a8c 100644
--- a/debian/patches/01-dont-use-march.diff
+++ b/debian/patches/01-dont-use-march.diff
@@ -1,33 +1,12 @@
 # Do not try to detect the architecture. Fixes FTBFS.
 
-diff -Naur swh-plugins-0.4.15+1.orig/configure swh-plugins-0.4.15+1/configure
---- swh-plugins-0.4.15+1.orig/configure	2009-07-29 13:10:35.000000000 +0200
-+++ swh-plugins-0.4.15+1/configure	2009-07-29 13:33:26.000000000 +0200
-@@ -13805,17 +13805,10 @@
-   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: CFLAGS appears to allready contain architecture specifaction, using exiting one" >&5
- $as_echo "$as_me: WARNING: CFLAGS appears to allready contain architecture specifaction, using exiting one" >&2;}
- else
--  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Can't find architecture specifaction in CFLAGS, picking one from build host CPU type" >&5
--$as_echo "$as_me: WARNING: Can't find architecture specifaction in CFLAGS, picking one from build host CPU type" >&2;}
--  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: May result in non-portable code" >&5
--$as_echo "$as_me: WARNING: May result in non-portable code" >&2;}
--    MACHINE="-march=${build_cpu}"
--  if test ${build_cpu} = "powerpc"; then MACHINE=""; fi
--  if test ${build_cpu} = "powerpc64"; then MACHINE=""; fi
--  if test ${build_cpu} = "x86_64"; then MACHINE=""; fi
--
--  CFLAGS="$CFLAGS -Wall -O3 -fomit-frame-pointer -fstrength-reduce -funroll-loops -ffast-math -fPIC -DPIC ${MACHINE} ${USE_SSE} ${DARWIN_CFLAGS}"
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Can't find architecture specifaction in CFLAGS" >&5
-+$as_echo "$as_me: WARNING: Can't find architecture specifaction in CFLAGS" >&2;}
- 
-+  CFLAGS="$CFLAGS -Wall -O3 -fomit-frame-pointer -fstrength-reduce -funroll-loops -ffast-math -fPIC -DPIC ${USE_SSE} ${DARWIN_CFLAGS}"
- 
-     fi
- 
-diff -Naur swh-plugins-0.4.15+1.orig/configure.in swh-plugins-0.4.15+1/configure.in
---- swh-plugins-0.4.15+1.orig/configure.in	2009-07-29 13:10:35.000000000 +0200
-+++ swh-plugins-0.4.15+1/configure.in	2009-07-29 13:32:52.000000000 +0200
-@@ -96,20 +96,13 @@
+---
+ configure.in |   13 +++----------
+ 1 file changed, 3 insertions(+), 10 deletions(-)
+
+--- swh-plugins.orig/configure.in
++++ swh-plugins/configure.in
+@@ -96,20 +96,13 @@ CFLAGS=$lrintf_save_CFLAGS -I at top_srcdir
  if [ echo ${CFLAGS} | grep "\-march=" ]; then
    AC_MSG_WARN([CFLAGS appears to allready contain architecture specifaction, using exiting one])
  else

-- 
swh-plugins packaging



More information about the pkg-multimedia-commits mailing list