diff options
| author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2016-12-16 16:57:28 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-12-17 09:56:44 +0000 |
| commit | 654e5468493d46d5529098ab5d78164a7545281e (patch) | |
| tree | 5efbf14db3fc476abfdff0ef5328822ff1a1897a /meta/recipes-support | |
| parent | c87361fc886432a9db584712bf3e41ecd0541960 (diff) | |
| download | openembedded-core-654e5468493d46d5529098ab5d78164a7545281e.tar.gz openembedded-core-654e5468493d46d5529098ab5d78164a7545281e.tar.bz2 openembedded-core-654e5468493d46d5529098ab5d78164a7545281e.zip | |
libfm: fix configure error if native vala is absent
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-support')
| -rw-r--r-- | meta/recipes-support/libfm/libfm/0001-Correctly-check-the-stamp-file-that-indicates-if-we-.patch | 28 | ||||
| -rw-r--r-- | meta/recipes-support/libfm/libfm_1.2.5.bb | 3 |
2 files changed, 30 insertions, 1 deletions
diff --git a/meta/recipes-support/libfm/libfm/0001-Correctly-check-the-stamp-file-that-indicates-if-we-.patch b/meta/recipes-support/libfm/libfm/0001-Correctly-check-the-stamp-file-that-indicates-if-we-.patch new file mode 100644 index 0000000000..fb91d90cf2 --- /dev/null +++ b/meta/recipes-support/libfm/libfm/0001-Correctly-check-the-stamp-file-that-indicates-if-we-.patch @@ -0,0 +1,28 @@ +From 23c6e9df611c86a5e97079e1b88c7a18474bf0bc Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Fri, 16 Dec 2016 16:52:04 +0200 +Subject: [PATCH] Correctly check the stamp file that indicates if we need to + re-build vala code + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index d043b3d..0e85590 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -42,7 +42,7 @@ AM_COND_IF(EXTRALIB_ONLY, + [enable_actions=no]) + if test x"$enable_actions" = xyes; then + dnl no vala compiler required when sources are from dist tarball +- if test -f src/actions/libfmactions_la_vala.stamp; then ++ if test -f $srcdir/src/actions/libfmactions_la_vala.stamp; then + AM_PROG_VALAC + else + AM_PROG_VALAC([0.13.0]) +-- +2.10.2 + diff --git a/meta/recipes-support/libfm/libfm_1.2.5.bb b/meta/recipes-support/libfm/libfm_1.2.5.bb index 638c364c87..aca59e1476 100644 --- a/meta/recipes-support/libfm/libfm_1.2.5.bb +++ b/meta/recipes-support/libfm/libfm_1.2.5.bb @@ -11,7 +11,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4641e94ec96f98fabc56ff9cc48be14b \ SECTION = "x11/libs" DEPENDS = "glib-2.0 pango gtk+3 menu-cache intltool-native libexif libfm-extra gettext-native" -SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.xz" +SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.xz \ + file://0001-Correctly-check-the-stamp-file-that-indicates-if-we-.patch" SRC_URI[md5sum] = "a1ba9ae5e920f38b647dd511edd6c807" SRC_URI[sha256sum] = "c706bb1020cf5f2d6f5a9226f692ce1985947134dcf2bde64278bd0420779b5a" |