Patchwork [1/1] mc: fix configure with automake 1.11.2

login
register
mail settings
Submitter Dexuan Cui
Date Jan. 4, 2012, 9:33 a.m.
Message ID <338da10abcd744ab75dfb184f8f81370727e5653.1325669461.git.dexuan.cui@intel.com>
Download mbox | patch
Permalink /patch/18289/
State Accepted
Commit 6a6b78180d2d7f8dbab02e96927de5a049c9a3ed
Headers show

Comments

Dexuan Cui - Jan. 4, 2012, 9:33 a.m.
As Nitin said, "automake version 1.11.2 has made use of dir variables
more strict, the pkglibexec var can not have SCRIPTS suffix. Using pkgdata
instead."

Fixes this error:
| contrib/Makefile.am:10: `pkglibexecdir' is not a legitimate directory for `SCRIPTS'
| autoreconf: automake failed with exit status: 1
NOTE: package mc-4.8.1-r0: task do_configure: Failed

Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
---
 .../mc/files/fix_for_automake_1.11.2.patch         |   69 ++++++++++++++++++++
 meta/recipes-extended/mc/mc_4.8.1.bb               |    3 +-
 2 files changed, 71 insertions(+), 1 deletions(-)
 create mode 100644 meta/recipes-extended/mc/files/fix_for_automake_1.11.2.patch
Richard Purdie - Jan. 4, 2012, 11:25 a.m.
On Wed, 2012-01-04 at 17:33 +0800, Dexuan Cui wrote:
> As Nitin said, "automake version 1.11.2 has made use of dir variables
> more strict, the pkglibexec var can not have SCRIPTS suffix. Using pkgdata
> instead."
> 
> Fixes this error:
> | contrib/Makefile.am:10: `pkglibexecdir' is not a legitimate directory for `SCRIPTS'
> | autoreconf: automake failed with exit status: 1
> NOTE: package mc-4.8.1-r0: task do_configure: Failed
> 
> Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
> ---
>  .../mc/files/fix_for_automake_1.11.2.patch         |   69 ++++++++++++++++++++
>  meta/recipes-extended/mc/mc_4.8.1.bb               |    3 +-
>  2 files changed, 71 insertions(+), 1 deletions(-)
>  create mode 100644 meta/recipes-extended/mc/files/fix_for_automake_1.11.2.patch

Merged to master, thanks.

Richard
Samuel Stirtzel - Jan. 5, 2012, 3:07 p.m.
2012/1/4 Dexuan Cui <dexuan.cui@intel.com>:
> As Nitin said, "automake version 1.11.2 has made use of dir variables
> more strict, the pkglibexec var can not have SCRIPTS suffix. Using pkgdata
> instead."
>
Actually this is a Automake inconsistency, it should be possible to
use pkglibexec with SCRIPTS suffix as stated in the manual [1].
After experiencing some build errors of this type, while building
commonly used software, I searched around and this thread came to my
attention:
http://lists.gnu.org/archive/html/automake/2012-01/msg00002.html

[1] Automake variable uniformity:
http://www.gnu.org/software/automake/manual/html_node/Uniform.html
Nitin A Kamble - Jan. 5, 2012, 4:56 p.m.
Samual,
  Thank you for this update of automake issue. I also notice that the patch to fix has gone in the automake development branch. I will add it to our automake recipe.

Nitin


> -----Original Message-----
> From: Samuel Stirtzel [mailto:s.stirtzel@googlemail.com]
> Sent: Thursday, January 05, 2012 7:07 AM
> To: Patches and discussions about the oe-core layer
> Cc: Kamble, Nitin A
> Subject: Re: [OE-core] [PATCH 1/1] mc: fix configure with automake
> 1.11.2
> 
> 2012/1/4 Dexuan Cui <dexuan.cui@intel.com>:
> > As Nitin said, "automake version 1.11.2 has made use of dir variables
> > more strict, the pkglibexec var can not have SCRIPTS suffix. Using
> pkgdata
> > instead."
> >
> Actually this is a Automake inconsistency, it should be possible to
> use pkglibexec with SCRIPTS suffix as stated in the manual [1].
> After experiencing some build errors of this type, while building
> commonly used software, I searched around and this thread came to my
> attention:
> http://lists.gnu.org/archive/html/automake/2012-01/msg00002.html
> 
> [1] Automake variable uniformity:
> http://www.gnu.org/software/automake/manual/html_node/Uniform.html
> 
> --
> Regards
> Samuel

Patch

diff --git a/meta/recipes-extended/mc/files/fix_for_automake_1.11.2.patch b/meta/recipes-extended/mc/files/fix_for_automake_1.11.2.patch
new file mode 100644
index 0000000..9b610ca
--- /dev/null
+++ b/meta/recipes-extended/mc/files/fix_for_automake_1.11.2.patch
@@ -0,0 +1,69 @@ 
+Upstream-Status: Pending
+
+As Nitin said, "automake version 1.11.2 has made use of dir variables
+more strict, the pkglibexec var can not have SCRIPTS suffix. Using pkgdata
+instead."
+
+Fixes this error:
+| contrib/Makefile.am:10: `pkglibexecdir' is not a legitimate directory for `SCRIPTS'
+| autoreconf: automake failed with exit status: 1
+NOTE: package mc-4.8.1-r0: task do_configure: Failed
+
+Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
+Wed Jan  4 17:04:47 CST 2012
+
+diff -Nru mc-4.8.1.orig//contrib/Makefile.am mc-4.8.1/contrib/Makefile.am
+--- mc-4.8.1.orig//contrib/Makefile.am	2011-11-30 15:44:40.000000000 +0800
++++ mc-4.8.1/contrib/Makefile.am	2012-01-04 17:03:16.926911680 +0800
+@@ -7,7 +7,7 @@
+ SCRIPTS_IN = mc.csh.in mc.sh.in mc-wrapper.csh.in mc-wrapper.sh.in
+ SCRIPTS_OUT = mc.csh mc.sh mc-wrapper.csh mc-wrapper.sh
+ 
+-pkglibexec_SCRIPTS = $(SCRIPTS_OUT)
++pkgdata_SCRIPTS = $(SCRIPTS_OUT)
+ pkglibexecdir =		$(libexecdir)/@PACKAGE@
+ 
+ cfgdir = $(sysconfdir)/@PACKAGE@
+diff -Nru mc-4.8.1.orig//contrib/Makefile.in mc-4.8.1/contrib/Makefile.in
+--- mc-4.8.1.orig//contrib/Makefile.in	2011-12-13 18:10:52.000000000 +0800
++++ mc-4.8.1/contrib/Makefile.in	2012-01-04 17:03:16.926911680 +0800
+@@ -112,7 +112,7 @@
+   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+ am__installdirs = "$(DESTDIR)$(pkglibexecdir)" "$(DESTDIR)$(cfgdir)"
+-SCRIPTS = $(pkglibexec_SCRIPTS)
++SCRIPTS = $(pkgdata_SCRIPTS)
+ AM_V_GEN = $(am__v_GEN_$(V))
+ am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+ am__v_GEN_0 = @echo "  GEN   " $@;
+@@ -372,7 +372,7 @@
+ noinst_DATA = README.xterm
+ SCRIPTS_IN = mc.csh.in mc.sh.in mc-wrapper.csh.in mc-wrapper.sh.in
+ SCRIPTS_OUT = mc.csh mc.sh mc-wrapper.csh mc-wrapper.sh
+-pkglibexec_SCRIPTS = $(SCRIPTS_OUT)
++pkgdata_SCRIPTS = $(SCRIPTS_OUT)
+ cfgdir = $(sysconfdir)/@PACKAGE@
+ cfg_DATA = \
+ 	$(LIBFILES_ADD)
+@@ -417,10 +417,10 @@
+ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ $(am__aclocal_m4_deps):
+-install-pkglibexecSCRIPTS: $(pkglibexec_SCRIPTS)
++install-pkglibexecSCRIPTS: $(pkgdata_SCRIPTS)
+ 	@$(NORMAL_INSTALL)
+ 	test -z "$(pkglibexecdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibexecdir)"
+-	@list='$(pkglibexec_SCRIPTS)'; test -n "$(pkglibexecdir)" || list=; \
++	@list='$(pkgdata_SCRIPTS)'; test -n "$(pkglibexecdir)" || list=; \
+ 	for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
+@@ -445,7 +445,7 @@
+ 
+ uninstall-pkglibexecSCRIPTS:
+ 	@$(NORMAL_UNINSTALL)
+-	@list='$(pkglibexec_SCRIPTS)'; test -n "$(pkglibexecdir)" || exit 0; \
++	@list='$(pkgdata_SCRIPTS)'; test -n "$(pkglibexecdir)" || exit 0; \
+ 	files=`for p in $$list; do echo "$$p"; done | \
+ 	       sed -e 's,.*/,,;$(transform)'`; \
+ 	test -n "$$list" || exit 0; \
diff --git a/meta/recipes-extended/mc/mc_4.8.1.bb b/meta/recipes-extended/mc/mc_4.8.1.bb
index de7fe7a..b66c170 100644
--- a/meta/recipes-extended/mc/mc_4.8.1.bb
+++ b/meta/recipes-extended/mc/mc_4.8.1.bb
@@ -6,9 +6,10 @@  SECTION = "console/utils"
 DEPENDS = "ncurses glib-2.0"
 RDEPENDS_${PN} = "ncurses-terminfo"
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://www.midnight-commander.org/downloads/${BPN}-${PV}.tar.bz2"
+SRC_URI += "file://fix_for_automake_1.11.2.patch"
 
 SRC_URI[md5sum] = "7d60c87d87b359831d976fa28034935e"
 SRC_URI[sha256sum] = "8f9bd09750c65a7786197a8f7e5a10a6dabf8c8737c564079ca393d8ecaf944d"