From 3f83d88dcb91b633407b417a22c327cd27c1f3c9 Mon Sep 17 00:00:00 2001 From: Bian Naimeng Date: Wed, 24 Jun 2015 16:26:34 +0800 Subject: imsettings: fix build error. multi-line ACLOCAL_AMFLAGS isn't supported by autoreconf, otherwise a configure error as follow will be caught. aclocal: error: non-option arguments are not accepted: '\'. Signed-off-by: Bian Naimeng Signed-off-by: Martin Jansa --- ...OCAL_AMFLAGS-isnot-supported-by-autoreconf.patch | 21 +++++++++++++++++++++ .../recipes-extended/imsettings/imsettings_1.6.8.bb | 3 ++- 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 meta-ruby/recipes-extended/imsettings/imsettings/multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch (limited to 'meta-ruby') diff --git a/meta-ruby/recipes-extended/imsettings/imsettings/multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch b/meta-ruby/recipes-extended/imsettings/imsettings/multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch new file mode 100644 index 0000000000..9e318474e4 --- /dev/null +++ b/meta-ruby/recipes-extended/imsettings/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 + +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 \ diff --git a/meta-ruby/recipes-extended/imsettings/imsettings_1.6.8.bb b/meta-ruby/recipes-extended/imsettings/imsettings_1.6.8.bb index 91443d7b6e..64a229bd0b 100644 --- a/meta-ruby/recipes-extended/imsettings/imsettings_1.6.8.bb +++ b/meta-ruby/recipes-extended/imsettings/imsettings_1.6.8.bb @@ -10,7 +10,8 @@ SECTION = "Applications/System" inherit autotools gtk-doc SRC_URI = "https://bitbucket.org/tagoh/imsettings/downloads/${BPN}-${PV}.tar.bz2 \ - file://gtk-is-required-by-notify.patch" + file://gtk-is-required-by-notify.patch \ + file://multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch" SRC_URI[md5sum] = "c31429f1d60e36d7f811f871c75b6c41" SRC_URI[sha256sum] = "2620ffbf9a6dc842dbf994b4773d4fe355eb77076ccf33f726ba63f16c0d08ba" -- cgit 1.2.3-korg