aboutsummaryrefslogtreecommitdiffstats
path: root/meta-xfce/recipes-extended/imsettings/multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2015-11-17 11:13:16 -0800
committerArmin Kuster <akuster808@gmail.com>2015-12-28 09:34:04 -0800
commit595877c90809c2f9fed3c18cbadee5ed278d8c99 (patch)
tree2c0f83c2bc344bfdc5ce4663b9dbfb5c01a599ac /meta-xfce/recipes-extended/imsettings/multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch
parentb830b523648150932fb71517dead1409f622ab70 (diff)
downloadmeta-openembedded-contrib-595877c90809c2f9fed3c18cbadee5ed278d8c99.tar.gz
imsettings: Move from meta-ruby to meta-xfce
It depends on xfconf which is XFCE component, no one depends on imsettings in meta-ruby so move it close to its dependencies. Ideally, xfconf should be turned into PACKAGECONFIG and this recipe then moved to meta-oe since all kind of DE's can use it then. For now it frees meta-ruby from unnecessary dependency on xfce layer Change-Id: I6b5896b0db504fad49a9da5967d3493e27c627b0 Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-xfce/recipes-extended/imsettings/multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch')
-rw-r--r--meta-xfce/recipes-extended/imsettings/multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch21
1 files changed, 21 insertions, 0 deletions
diff --git a/meta-xfce/recipes-extended/imsettings/multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch b/meta-xfce/recipes-extended/imsettings/multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch
new file mode 100644
index 0000000000..9e318474e4
--- /dev/null
+++ b/meta-xfce/recipes-extended/imsettings/multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch
@@ -0,0 +1,21 @@
+multi-line ACLOCAL_AMFLAGS isn't supported by autoreconf.
+It will cause configure error as follow.
+
+ aclocal: error: non-option arguments are not accepted: '\'.
+
+Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com>
+
+diff -Nurp imsettings-1.6.8.orig/Makefile.am imsettings-1.6.8/Makefile.am
+--- imsettings-1.6.8.orig/Makefile.am 2013-02-08 11:33:59.000000000 +0900
++++ imsettings-1.6.8/Makefile.am 2015-06-24 14:15:32.070000007 +0900
+@@ -1,9 +1,7 @@
+ NULL =
+ SUBDIRS = data imsettings imsettings-daemon backends utils po tests docs
+
+-ACLOCAL_AMFLAGS = \
+- -I m4macros \
+- $(NULL)
++ACLOCAL_AMFLAGS = -I m4macros $(NULL)
+
+ CONFIGURE_DEPENDENCIES = \
+ requires \