diff options
author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2012-07-12 22:20:25 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-07-17 10:54:06 +0100 |
commit | 20a04e39b739c095dcd3396fc52832100f2b10c6 (patch) | |
tree | 3326e6a3d8cc42fd3a971e961851c6994c5133e6 | |
parent | 1f04e5276770f1bf8bbdf335ce61c8ff7f3e9a4e (diff) | |
download | poky-20a04e39b739c095dcd3396fc52832100f2b10c6.tar.gz |
sed-4.1.2: fix build with automake 1.12.x
automake has depricated use of @mkdir_p@, Fix the
issue by using @MKDIR_P@ instead.
added a new patch:
sed-4.1.2_fix_for_automake-1.12.patch
(From OE-Core rev: b5e9b6db49770261e8394e676eec603125b51a44)
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-extended/sed/sed-4.1.2/sed-4.1.2_fix_for_automake-1.12.patch | 37 | ||||
-rw-r--r-- | meta/recipes-extended/sed/sed_4.1.2.bb | 5 |
2 files changed, 40 insertions, 2 deletions
diff --git a/meta/recipes-extended/sed/sed-4.1.2/sed-4.1.2_fix_for_automake-1.12.patch b/meta/recipes-extended/sed/sed-4.1.2/sed-4.1.2_fix_for_automake-1.12.patch new file mode 100644 index 0000000000..80594068ac --- /dev/null +++ b/meta/recipes-extended/sed/sed-4.1.2/sed-4.1.2_fix_for_automake-1.12.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | automake-1.12.x has deprecated use of @mkdir_p@, fix the issue by using @MKDIR_P@ instead. | ||
4 | |||
5 | Avoid this build issue: | ||
6 | | make[1]: mkdir_p@: Command not found | ||
7 | | make[1]: *** [install-data-yes] Error 127 | ||
8 | |||
9 | Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> | ||
10 | 2012/07/13 | ||
11 | |||
12 | Index: sed-4.1.2/intl/Makefile.in | ||
13 | =================================================================== | ||
14 | --- sed-4.1.2.orig/intl/Makefile.in | ||
15 | +++ sed-4.1.2/intl/Makefile.in | ||
16 | @@ -40,7 +40,7 @@ subdir = intl | ||
17 | INSTALL = @INSTALL@ | ||
18 | INSTALL_DATA = @INSTALL_DATA@ | ||
19 | mkinstalldirs = $(mkdir_p) | ||
20 | -mkdir_p = @mkdir_p@ | ||
21 | +mkdir_p = @MKDIR_P@ | ||
22 | |||
23 | l = @INTL_LIBTOOL_SUFFIX_PREFIX@ | ||
24 | |||
25 | Index: sed-4.1.2/po/Makefile.in.in | ||
26 | =================================================================== | ||
27 | --- sed-4.1.2.orig/po/Makefile.in.in | ||
28 | +++ sed-4.1.2/po/Makefile.in.in | ||
29 | @@ -29,7 +29,7 @@ gettextsrcdir = $(datadir)/gettext/po | ||
30 | INSTALL = /srv/home/nitin/builds2/build0/tmp/sysroots/x86_64-linux/usr/bin/install -c | ||
31 | INSTALL_DATA = ${INSTALL} -m 644 | ||
32 | mkinstalldirs = $(mkdir_p) | ||
33 | -mkdir_p = @mkdir_p@ | ||
34 | +mkdir_p = @MKDIR_P@ | ||
35 | |||
36 | CC = i586-poky-linux-gcc -m32 -march=i586 --sysroot=/srv/home/nitin/builds2/build0/tmp/sysroots/qemux86 | ||
37 | GMSGFMT = /srv/home/nitin/builds2/build0/tmp/sysroots/x86_64-linux/usr/bin/msgfmt | ||
diff --git a/meta/recipes-extended/sed/sed_4.1.2.bb b/meta/recipes-extended/sed/sed_4.1.2.bb index ca22736b7f..3455c20703 100644 --- a/meta/recipes-extended/sed/sed_4.1.2.bb +++ b/meta/recipes-extended/sed/sed_4.1.2.bb | |||
@@ -4,10 +4,11 @@ LICENSE = "GPLv2+" | |||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ |
5 | file://sed/sed.h;beginline=1;endline=17;md5=e00ffd1837f298439a214fd197f6a407" | 5 | file://sed/sed.h;beginline=1;endline=17;md5=e00ffd1837f298439a214fd197f6a407" |
6 | SECTION = "console/utils" | 6 | SECTION = "console/utils" |
7 | PR = "r5" | 7 | PR = "r6" |
8 | 8 | ||
9 | SRC_URI = "${GNU_MIRROR}/sed/sed-${PV}.tar.gz \ | 9 | SRC_URI = "${GNU_MIRROR}/sed/sed-${PV}.tar.gz \ |
10 | file://fix_return_type.patch" | 10 | file://fix_return_type.patch \ |
11 | file://sed-4.1.2_fix_for_automake-1.12.patch " | ||
11 | 12 | ||
12 | SRC_URI[md5sum] = "928f0e06422f414091917401f1a834d0" | 13 | SRC_URI[md5sum] = "928f0e06422f414091917401f1a834d0" |
13 | SRC_URI[sha256sum] = "638e837ba765d5da0a30c98b57c2953cecea96827882f594612acace93ceeeab" | 14 | SRC_URI[sha256sum] = "638e837ba765d5da0a30c98b57c2953cecea96827882f594612acace93ceeeab" |