From ca51dda5064492a654d23f18e053a35e90882095 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 1 Feb 2010 15:01:18 +0000 Subject: [PATCH] libsndfile1: Add infinite recursion fix for recent autotools Signed-off-by: Richard Purdie --- .../libsndfile/libsndfile1/acincludefix.patch | 26 +++++++++++++++++++ .../{files => libsndfile1}/add-cxx.patch | 0 .../packages/libsndfile/libsndfile1_1.0.17.bb | 3 ++- 3 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 meta-moblin/packages/libsndfile/libsndfile1/acincludefix.patch rename meta-moblin/packages/libsndfile/{files => libsndfile1}/add-cxx.patch (100%) diff --git a/meta-moblin/packages/libsndfile/libsndfile1/acincludefix.patch b/meta-moblin/packages/libsndfile/libsndfile1/acincludefix.patch new file mode 100644 index 0000000000..46a21c19be --- /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 similarity index 100% rename from meta-moblin/packages/libsndfile/files/add-cxx.patch rename to 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 7ca7731511..b49d7a45e7 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}" -- 2.40.1