summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarko Lindqvist <cazfi74@gmail.com>2013-10-25 10:37:12 +0300
committerMarko Lindqvist <cazfi74@gmail.com>2013-10-25 10:37:12 +0300
commit6ea9e9fe207b9c3b84a4450268ea289246b83055 (patch)
tree47d71b13c536d413532865d085d3affa2748bf72
parentd97f472684f7ac38fac3dbabf92624ca9a2bd7ad (diff)
downloadopenembedded-core-contrib-cazfi/am14.tar.gz
openembedded-core-contrib-cazfi/am14.tar.bz2
openembedded-core-contrib-cazfi/am14.zip
libfm: allow build with automake-1.14cazfi/am14
Do not consider automake warnings about future incompatibility errors. Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
-rw-r--r--meta/recipes-support/libfm/libfm-1.1.2.2/ignore_automake_warnings.patch14
-rw-r--r--meta/recipes-support/libfm/libfm_1.1.2.2.bb1
2 files changed, 15 insertions, 0 deletions
diff --git a/meta/recipes-support/libfm/libfm-1.1.2.2/ignore_automake_warnings.patch b/meta/recipes-support/libfm/libfm-1.1.2.2/ignore_automake_warnings.patch
new file mode 100644
index 0000000000..58a2f09d66
--- /dev/null
+++ b/meta/recipes-support/libfm/libfm-1.1.2.2/ignore_automake_warnings.patch
@@ -0,0 +1,14 @@
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
+diff -Nurd libfm-1.1.2.2/configure.ac libfm-1.1.2.2/configure.ac
+--- libfm-1.1.2.2/configure.ac 2013-08-22 23:16:09.000000000 +0300
++++ libfm-1.1.2.2/configure.ac 2013-10-25 01:35:18.110323079 +0300
+@@ -3,7 +3,7 @@
+
+ AC_PREREQ([2.63])
+ AC_INIT([libfm], [1.1.2.2], [http://pcmanfm.sourceforge.net/])
+-AM_INIT_AUTOMAKE([-Wall -Werror foreign])
++AM_INIT_AUTOMAKE([-Wall foreign])
+ AC_CONFIG_MACRO_DIR(m4)
+ AC_CONFIG_HEADERS([config.h])
diff --git a/meta/recipes-support/libfm/libfm_1.1.2.2.bb b/meta/recipes-support/libfm/libfm_1.1.2.2.bb
index 1146d16503..8460223ee3 100644
--- a/meta/recipes-support/libfm/libfm_1.1.2.2.bb
+++ b/meta/recipes-support/libfm/libfm_1.1.2.2.bb
@@ -12,6 +12,7 @@ DEPENDS = "glib-2.0 pango gtk+ menu-cache intltool-native libexif"
SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.gz \
file://fix-make-parallelism-issue.patch \
+ file://ignore_automake_warnings.patch \
"
SRC_URI[md5sum] = "ea3d09b23ef4c37cb84ae57ea16b8f08"