summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2012-01-05 09:15:23 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-06 12:11:35 +0000
commit801bd4bc8cca017c2e6e539ab6deede485a27db9 (patch)
treead6851579a740459398045b9cc44e6137e9b502d /meta/recipes-extended
parent39d5655be07106a967db921e47b9492d3a065e09 (diff)
downloadpoky-801bd4bc8cca017c2e6e539ab6deede485a27db9.tar.gz
mc: remove not needed fix for automake 1.11.2
The pkglibexec_SCRIPTS pair is valid. the 1.11.2 introduced an bug to make it invalid. Now the automake 1.11.2 recipe is fixed, so no need for this fix for mc recipe. (From OE-Core rev: 33fa7ebd1024bff84c195285270fc8db48c90b83) Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/mc/files/fix_for_automake_1.11.2.patch69
-rw-r--r--meta/recipes-extended/mc/mc_4.8.1.bb3
2 files changed, 1 insertions, 71 deletions
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
deleted file mode 100644
index 9b610caa78..0000000000
--- a/meta/recipes-extended/mc/files/fix_for_automake_1.11.2.patch
+++ /dev/null
@@ -1,69 +0,0 @@
1Upstream-Status: Pending
2
3As Nitin said, "automake version 1.11.2 has made use of dir variables
4more strict, the pkglibexec var can not have SCRIPTS suffix. Using pkgdata
5instead."
6
7Fixes this error:
8| contrib/Makefile.am:10: `pkglibexecdir' is not a legitimate directory for `SCRIPTS'
9| autoreconf: automake failed with exit status: 1
10NOTE: package mc-4.8.1-r0: task do_configure: Failed
11
12Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
13Wed Jan 4 17:04:47 CST 2012
14
15diff -Nru mc-4.8.1.orig//contrib/Makefile.am mc-4.8.1/contrib/Makefile.am
16--- mc-4.8.1.orig//contrib/Makefile.am 2011-11-30 15:44:40.000000000 +0800
17+++ mc-4.8.1/contrib/Makefile.am 2012-01-04 17:03:16.926911680 +0800
18@@ -7,7 +7,7 @@
19 SCRIPTS_IN = mc.csh.in mc.sh.in mc-wrapper.csh.in mc-wrapper.sh.in
20 SCRIPTS_OUT = mc.csh mc.sh mc-wrapper.csh mc-wrapper.sh
21
22-pkglibexec_SCRIPTS = $(SCRIPTS_OUT)
23+pkgdata_SCRIPTS = $(SCRIPTS_OUT)
24 pkglibexecdir = $(libexecdir)/@PACKAGE@
25
26 cfgdir = $(sysconfdir)/@PACKAGE@
27diff -Nru mc-4.8.1.orig//contrib/Makefile.in mc-4.8.1/contrib/Makefile.in
28--- mc-4.8.1.orig//contrib/Makefile.in 2011-12-13 18:10:52.000000000 +0800
29+++ mc-4.8.1/contrib/Makefile.in 2012-01-04 17:03:16.926911680 +0800
30@@ -112,7 +112,7 @@
31 sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
32 sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
33 am__installdirs = "$(DESTDIR)$(pkglibexecdir)" "$(DESTDIR)$(cfgdir)"
34-SCRIPTS = $(pkglibexec_SCRIPTS)
35+SCRIPTS = $(pkgdata_SCRIPTS)
36 AM_V_GEN = $(am__v_GEN_$(V))
37 am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
38 am__v_GEN_0 = @echo " GEN " $@;
39@@ -372,7 +372,7 @@
40 noinst_DATA = README.xterm
41 SCRIPTS_IN = mc.csh.in mc.sh.in mc-wrapper.csh.in mc-wrapper.sh.in
42 SCRIPTS_OUT = mc.csh mc.sh mc-wrapper.csh mc-wrapper.sh
43-pkglibexec_SCRIPTS = $(SCRIPTS_OUT)
44+pkgdata_SCRIPTS = $(SCRIPTS_OUT)
45 cfgdir = $(sysconfdir)/@PACKAGE@
46 cfg_DATA = \
47 $(LIBFILES_ADD)
48@@ -417,10 +417,10 @@
49 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
50 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
51 $(am__aclocal_m4_deps):
52-install-pkglibexecSCRIPTS: $(pkglibexec_SCRIPTS)
53+install-pkglibexecSCRIPTS: $(pkgdata_SCRIPTS)
54 @$(NORMAL_INSTALL)
55 test -z "$(pkglibexecdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibexecdir)"
56- @list='$(pkglibexec_SCRIPTS)'; test -n "$(pkglibexecdir)" || list=; \
57+ @list='$(pkgdata_SCRIPTS)'; test -n "$(pkglibexecdir)" || list=; \
58 for p in $$list; do \
59 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
60 if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
61@@ -445,7 +445,7 @@
62
63 uninstall-pkglibexecSCRIPTS:
64 @$(NORMAL_UNINSTALL)
65- @list='$(pkglibexec_SCRIPTS)'; test -n "$(pkglibexecdir)" || exit 0; \
66+ @list='$(pkgdata_SCRIPTS)'; test -n "$(pkglibexecdir)" || exit 0; \
67 files=`for p in $$list; do echo "$$p"; done | \
68 sed -e 's,.*/,,;$(transform)'`; \
69 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 b66c170b7a..78bbc9d104 100644
--- a/meta/recipes-extended/mc/mc_4.8.1.bb
+++ b/meta/recipes-extended/mc/mc_4.8.1.bb
@@ -6,10 +6,9 @@ SECTION = "console/utils"
6DEPENDS = "ncurses glib-2.0" 6DEPENDS = "ncurses glib-2.0"
7RDEPENDS_${PN} = "ncurses-terminfo" 7RDEPENDS_${PN} = "ncurses-terminfo"
8 8
9PR = "r1" 9PR = "r2"
10 10
11SRC_URI = "http://www.midnight-commander.org/downloads/${BPN}-${PV}.tar.bz2" 11SRC_URI = "http://www.midnight-commander.org/downloads/${BPN}-${PV}.tar.bz2"
12SRC_URI += "file://fix_for_automake_1.11.2.patch"
13 12
14SRC_URI[md5sum] = "7d60c87d87b359831d976fa28034935e" 13SRC_URI[md5sum] = "7d60c87d87b359831d976fa28034935e"
15SRC_URI[sha256sum] = "8f9bd09750c65a7786197a8f7e5a10a6dabf8c8737c564079ca393d8ecaf944d" 14SRC_URI[sha256sum] = "8f9bd09750c65a7786197a8f7e5a10a6dabf8c8737c564079ca393d8ecaf944d"