From b03c9add866e8e3e0f08f812a3ecb0b4aa793359 Mon Sep 17 00:00:00 2001 From: Tim Orling Date: Mon, 26 May 2014 11:45:11 -0700 Subject: schroedinger: fix S!=B error, rename "files" Fixes: *** No rule to make target `[...]/schroedinger/1.0.11-r0/schroedinger-1.0.11/schroedinger/tmp-orc.c', needed by `tmp-orc.o'. Stop. Rename "files/" to "schroedinger/" Signed-off-by: Tim Orling Signed-off-by: Martin Jansa --- .../schroedinger/files/configure.ac.patch | 20 -------------------- .../schroedinger/schroedinger/configure.ac.patch | 20 ++++++++++++++++++++ .../schroedinger/schroedinger_1.0.11.bb | 2 +- 3 files changed, 21 insertions(+), 21 deletions(-) delete mode 100644 meta-multimedia/recipes-multimedia/schroedinger/files/configure.ac.patch create mode 100644 meta-multimedia/recipes-multimedia/schroedinger/schroedinger/configure.ac.patch (limited to 'meta-multimedia') diff --git a/meta-multimedia/recipes-multimedia/schroedinger/files/configure.ac.patch b/meta-multimedia/recipes-multimedia/schroedinger/files/configure.ac.patch deleted file mode 100644 index 2ed8d22c6b..0000000000 --- a/meta-multimedia/recipes-multimedia/schroedinger/files/configure.ac.patch +++ /dev/null @@ -1,20 +0,0 @@ -Use the version of orcc in the sysroot not the one from the host - -Signed-off-by: Dongxiao Xu -Signed-off-by: Paul Eggleton - -Upstream-Status: Inappropriate [configuration] - -Index: schroedinger-1.0.9/configure.ac -=================================================================== ---- schroedinger-1.0.9.orig/configure.ac -+++ schroedinger-1.0.9/configure.ac -@@ -54,7 +54,7 @@ if test "x${HAVE_ORC}" != xyes ; then - AC_ERROR([orc-0.4 >= $ORC_VER is required]) - fi - SCHRO_PKG_DEPS="$SCHRO_PKG_DEPS orc-0.4 >= $ORC_VER" --ORCC=`$PKG_CONFIG --variable=orcc orc-0.4` -+ORCC=$STAGING_DIR`$PKG_CONFIG --variable=orcc orc-0.4` - AC_SUBST(ORCC) - - AC_ARG_WITH([thread], diff --git a/meta-multimedia/recipes-multimedia/schroedinger/schroedinger/configure.ac.patch b/meta-multimedia/recipes-multimedia/schroedinger/schroedinger/configure.ac.patch new file mode 100644 index 0000000000..2ed8d22c6b --- /dev/null +++ b/meta-multimedia/recipes-multimedia/schroedinger/schroedinger/configure.ac.patch @@ -0,0 +1,20 @@ +Use the version of orcc in the sysroot not the one from the host + +Signed-off-by: Dongxiao Xu +Signed-off-by: Paul Eggleton + +Upstream-Status: Inappropriate [configuration] + +Index: schroedinger-1.0.9/configure.ac +=================================================================== +--- schroedinger-1.0.9.orig/configure.ac ++++ schroedinger-1.0.9/configure.ac +@@ -54,7 +54,7 @@ if test "x${HAVE_ORC}" != xyes ; then + AC_ERROR([orc-0.4 >= $ORC_VER is required]) + fi + SCHRO_PKG_DEPS="$SCHRO_PKG_DEPS orc-0.4 >= $ORC_VER" +-ORCC=`$PKG_CONFIG --variable=orcc orc-0.4` ++ORCC=$STAGING_DIR`$PKG_CONFIG --variable=orcc orc-0.4` + AC_SUBST(ORCC) + + AC_ARG_WITH([thread], diff --git a/meta-multimedia/recipes-multimedia/schroedinger/schroedinger_1.0.11.bb b/meta-multimedia/recipes-multimedia/schroedinger/schroedinger_1.0.11.bb index c338903f1e..d38eb94773 100644 --- a/meta-multimedia/recipes-multimedia/schroedinger/schroedinger_1.0.11.bb +++ b/meta-multimedia/recipes-multimedia/schroedinger/schroedinger_1.0.11.bb @@ -18,5 +18,5 @@ SRC_URI[sha256sum] = "1e572a0735b92aca5746c4528f9bebd35aa0ccf8619b22fa2756137a8c EXTRA_OECONF += "STAGING_DIR=${STAGING_DIR_NATIVE}" -inherit autotools pkgconfig +inherit autotools-brokensep pkgconfig -- cgit 1.2.3-korg