diff options
author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2012-05-04 13:23:10 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-05-25 11:18:02 +0100 |
commit | bc56c0415aa87f5d531aac4e213ddd15adc65fcc (patch) | |
tree | 3a65c8408385510d9eca1482f67b46636ee02b5b | |
parent | e9e25428d42a0546feb2e0b1cff4fa3680d2802b (diff) | |
download | poky-bc56c0415aa87f5d531aac4e213ddd15adc65fcc.tar.gz |
make-3.81: fix build with automake 1.12
(From OE-Core rev: 8dbb71a8bf33c6d2494dbbb74d3e944d788eca50)
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-devtools/make/make-3.81/make_fix_for_automake-1.12.patch | 43 | ||||
-rw-r--r-- | meta/recipes-devtools/make/make_3.81.bb | 4 |
2 files changed, 46 insertions, 1 deletions
diff --git a/meta/recipes-devtools/make/make-3.81/make_fix_for_automake-1.12.patch b/meta/recipes-devtools/make/make-3.81/make_fix_for_automake-1.12.patch new file mode 100644 index 0000000000..9b2e96431d --- /dev/null +++ b/meta/recipes-devtools/make/make-3.81/make_fix_for_automake-1.12.patch | |||
@@ -0,0 +1,43 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | automake 1.12 has depricated automatic de-ANSI-fication support | ||
4 | |||
5 | this patch avoids these kinds of errors: | ||
6 | |||
7 | | configure.in:48: error: automatic de-ANSI-fication support has been removed | ||
8 | ... | ||
9 | | Makefile.am:19: error: automatic de-ANSI-fication support has been removed | ||
10 | | autoreconf: automake failed with exit status: 1 | ||
11 | | ERROR: autoreconf execution failed. | ||
12 | |||
13 | |||
14 | Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> | ||
15 | 2012/05/04 | ||
16 | |||
17 | Index: make-3.81/configure.in | ||
18 | =================================================================== | ||
19 | --- make-3.81.orig/configure.in | ||
20 | +++ make-3.81/configure.in | ||
21 | @@ -44,9 +44,6 @@ AC_AIX | ||
22 | AC_ISC_POSIX | ||
23 | AC_MINIX | ||
24 | |||
25 | -# Needed for ansi2knr | ||
26 | -AM_C_PROTOTYPES | ||
27 | - | ||
28 | # Enable gettext, in "external" mode. | ||
29 | |||
30 | AM_GNU_GETTEXT_VERSION(0.14.1) | ||
31 | Index: make-3.81/Makefile.am | ||
32 | =================================================================== | ||
33 | --- make-3.81.orig/Makefile.am | ||
34 | +++ make-3.81/Makefile.am | ||
35 | @@ -16,7 +16,7 @@ | ||
36 | # GNU Make; see the file COPYING. If not, write to the Free Software | ||
37 | # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | ||
38 | |||
39 | -AUTOMAKE_OPTIONS = 1.8 dist-bzip2 check-news ansi2knr | ||
40 | +AUTOMAKE_OPTIONS = 1.8 dist-bzip2 check-news | ||
41 | ACLOCAL_AMFLAGS = -I config | ||
42 | |||
43 | MAKE_HOST = @MAKE_HOST@ | ||
diff --git a/meta/recipes-devtools/make/make_3.81.bb b/meta/recipes-devtools/make/make_3.81.bb index 9458c39132..45ab6caddc 100644 --- a/meta/recipes-devtools/make/make_3.81.bb +++ b/meta/recipes-devtools/make/make_3.81.bb | |||
@@ -1,4 +1,4 @@ | |||
1 | PR = "r0" | 1 | PR = "r1" |
2 | 2 | ||
3 | LICENSE = "GPLv2 & LGPLv2" | 3 | LICENSE = "GPLv2 & LGPLv2" |
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=361b6b837cad26c6900a926b62aada5f \ | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=361b6b837cad26c6900a926b62aada5f \ |
@@ -7,6 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=361b6b837cad26c6900a926b62aada5f \ | |||
7 | 7 | ||
8 | require make.inc | 8 | require make.inc |
9 | 9 | ||
10 | SRC_URI += "file://make_fix_for_automake-1.12.patch" | ||
11 | |||
10 | SRC_URI[md5sum] = "354853e0b2da90c527e35aabb8d6f1e6" | 12 | SRC_URI[md5sum] = "354853e0b2da90c527e35aabb8d6f1e6" |
11 | SRC_URI[sha256sum] = "f3e69023771e23908f5d5592954d8271d3d6af09693cecfd29cee6fde8550dc8" | 13 | SRC_URI[sha256sum] = "f3e69023771e23908f5d5592954d8271d3d6af09693cecfd29cee6fde8550dc8" |
12 | 14 | ||