summaryrefslogtreecommitdiff
path: root/meta-moblin/packages
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-02-01 15:01:18 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2010-02-01 15:01:18 +0000
commitca51dda5064492a654d23f18e053a35e90882095 (patch)
tree61b53d03e89696a630df31c0db26280509c4d392 /meta-moblin/packages
parent5cf94e1d1ef1c2655b47f4d57221b807861c37e1 (diff)
downloadopenembedded-core-ca51dda5064492a654d23f18e053a35e90882095.tar.gz
openembedded-core-ca51dda5064492a654d23f18e053a35e90882095.tar.bz2
openembedded-core-ca51dda5064492a654d23f18e053a35e90882095.tar.xz
openembedded-core-ca51dda5064492a654d23f18e053a35e90882095.zip
libsndfile1: Add infinite recursion fix for recent autotools
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta-moblin/packages')
-rw-r--r--meta-moblin/packages/libsndfile/libsndfile1/acincludefix.patch26
-rw-r--r--meta-moblin/packages/libsndfile/libsndfile1/add-cxx.patch (renamed from meta-moblin/packages/libsndfile/files/add-cxx.patch)0
-rw-r--r--meta-moblin/packages/libsndfile/libsndfile1_1.0.17.bb3
3 files changed, 28 insertions, 1 deletions
diff --git a/meta-moblin/packages/libsndfile/libsndfile1/acincludefix.patch b/meta-moblin/packages/libsndfile/libsndfile1/acincludefix.patch
new file mode 100644
index 000000000..46a21c19b
--- /dev/null
+++ b/meta-moblin/packages/libsndfile/libsndfile1/acincludefix.patch
@@ -0,0 +1,26 @@
+Fix m4 quoting to avoid an infinite loop in m4 with recent autoconf/automake
+
+RP 1/2/10
+
+Index: libsndfile-1.0.17/acinclude.m4
+===================================================================
+--- libsndfile-1.0.17.orig/acinclude.m4 2010-02-01 14:53:35.517826746 +0000
++++ libsndfile-1.0.17/acinclude.m4 2010-02-01 14:53:51.409122706 +0000
+@@ -255,7 +255,7 @@
+
+ )
+ ]
+-
++[
+ if test $ac_cv_c_byte_order = big ; then
+ ac_cv_c_big_endian=1
+ ac_cv_c_little_endian=0
+@@ -272,7 +272,7 @@
+ AC_MSG_WARN([[*** src/config.h may need to be hand editied. ]])
+ AC_MSG_WARN([[*****************************************************************]])
+ fi
+-
++]
+ )# AC_C_FIND_ENDIAN
+
+
diff --git a/meta-moblin/packages/libsndfile/files/add-cxx.patch b/meta-moblin/packages/libsndfile/libsndfile1/add-cxx.patch
index da0c4010e..da0c4010e 100644
--- a/meta-moblin/packages/libsndfile/files/add-cxx.patch
+++ b/meta-moblin/packages/libsndfile/libsndfile1/add-cxx.patch
diff --git a/meta-moblin/packages/libsndfile/libsndfile1_1.0.17.bb b/meta-moblin/packages/libsndfile/libsndfile1_1.0.17.bb
index 7ca773151..b49d7a45e 100644
--- a/meta-moblin/packages/libsndfile/libsndfile1_1.0.17.bb
+++ b/meta-moblin/packages/libsndfile/libsndfile1_1.0.17.bb
@@ -4,9 +4,10 @@ AUTHOR = "Erik de Castro Lopo"
DEPENDS = "sqlite3"
SECTION = "libs/multimedia"
LICENSE = "LGPL"
-PR = "r3"
+PR = "r4"
SRC_URI = "http://www.mega-nerd.com/libsndfile/libsndfile-${PV}.tar.gz \
+ file://acincludefix.patch;patch=1 \
file://add-cxx.patch;patch=1"
S = "${WORKDIR}/libsndfile-${PV}"