From: Samuel Martin <s.martin49@gmail.com>
Date: Tue, 2 Dec 2014 20:42:10 +0000 (+0100)
Subject: package/flac: fix patch file extension
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ce49c7c852d74a24967e491db10d9135a1fd6b70;p=buildroot.git

package/flac: fix patch file extension

Fixes:
  http://autobuild.buildroot.org/results/c22/c22f29fd787a3d12d86cc3cd3e2d9c8688d2f65d/
  http://autobuild.buildroot.org/results/1f8/1f824e3aa17fb17e7efe3e4c1636974fea79c1f9/
  http://autobuild.buildroot.org/results/8ad/8ad965fbc19e22d3f43899cb5efb42626fa2f55e/

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---

diff --git a/package/flac/0001-configure-don-t-try-to-unset-g-from-CFLAGS.patch b/package/flac/0001-configure-don-t-try-to-unset-g-from-CFLAGS.patch
new file mode 100644
index 0000000000..3aff5a8c95
--- /dev/null
+++ b/package/flac/0001-configure-don-t-try-to-unset-g-from-CFLAGS.patch
@@ -0,0 +1,27 @@
+The sed expression is wrong, any flags with '-g' in any position gets
+zapped, for example:
+
+-mfloat-gprs=double (for powerpc e500) -> -mfloatprs=double.
+
+Which gives build errors and is perfectly valid in real use scenarios to
+switch from e500v1 (single precision) code to e500v2 (double precision) code.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -Nura flac-1.3.1.orig/configure flac-1.3.1/configure
+--- flac-1.3.1.orig/configure	2014-11-27 20:43:29.921303105 -0300
++++ flac-1.3.1/configure	2014-11-27 20:45:33.460250179 -0300
+@@ -19870,11 +19870,10 @@
+ 
+ if test "x$debug" = xtrue; then
+ 	CPPFLAGS="-DDEBUG $CPPFLAGS"
+-	CFLAGS=$(echo "$CFLAGS" | sed 's/-g//')
+-	CFLAGS="-g $CFLAGS"
++	CFLAGS=$(echo "-g $CFLAGS")
+ else
+ 	CPPFLAGS="-DNDEBUG $CPPFLAGS"
+-	CFLAGS=$(echo "$CFLAGS" | sed 's/-O2//;s/-g//')
++	CFLAGS=$(echo "$CFLAGS" | sed 's/-O2//')
+ 	CFLAGS="-O3 -funroll-loops $CFLAGS"
+ fi
+ 
diff --git a/package/flac/0001-configure-don-t-try-to-unset-g-from-CFLAGS.txt b/package/flac/0001-configure-don-t-try-to-unset-g-from-CFLAGS.txt
deleted file mode 100644
index 3aff5a8c95..0000000000
--- a/package/flac/0001-configure-don-t-try-to-unset-g-from-CFLAGS.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-The sed expression is wrong, any flags with '-g' in any position gets
-zapped, for example:
-
--mfloat-gprs=double (for powerpc e500) -> -mfloatprs=double.
-
-Which gives build errors and is perfectly valid in real use scenarios to
-switch from e500v1 (single precision) code to e500v2 (double precision) code.
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-
-diff -Nura flac-1.3.1.orig/configure flac-1.3.1/configure
---- flac-1.3.1.orig/configure	2014-11-27 20:43:29.921303105 -0300
-+++ flac-1.3.1/configure	2014-11-27 20:45:33.460250179 -0300
-@@ -19870,11 +19870,10 @@
- 
- if test "x$debug" = xtrue; then
- 	CPPFLAGS="-DDEBUG $CPPFLAGS"
--	CFLAGS=$(echo "$CFLAGS" | sed 's/-g//')
--	CFLAGS="-g $CFLAGS"
-+	CFLAGS=$(echo "-g $CFLAGS")
- else
- 	CPPFLAGS="-DNDEBUG $CPPFLAGS"
--	CFLAGS=$(echo "$CFLAGS" | sed 's/-O2//;s/-g//')
-+	CFLAGS=$(echo "$CFLAGS" | sed 's/-O2//')
- 	CFLAGS="-O3 -funroll-loops $CFLAGS"
- fi
-