diff options
-rw-r--r-- | meta/recipes-devtools/rpm/rpm/rpm_fix_for_automake-1.12.patch | 21 | ||||
-rw-r--r-- | meta/recipes-devtools/rpm/rpm_5.4.0.bb | 3 |
2 files changed, 23 insertions, 1 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/rpm_fix_for_automake-1.12.patch b/meta/recipes-devtools/rpm/rpm/rpm_fix_for_automake-1.12.patch new file mode 100644 index 0000000000..abbb15d5bf --- /dev/null +++ b/meta/recipes-devtools/rpm/rpm/rpm_fix_for_automake-1.12.patch | |||
@@ -0,0 +1,21 @@ | |||
1 | Upstream-Status: 2012/05/02 | ||
2 | |||
3 | automake 1.12 has depricated automatic de-ANSI-fication. | ||
4 | |||
5 | fix this issue: | ||
6 | | configure.ac:564: error: automatic de-ANSI-fication support has been removed | ||
7 | |||
8 | Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> | ||
9 | 2012/05/02 | ||
10 | Index: rpm-5.4.0/configure.ac | ||
11 | =================================================================== | ||
12 | --- rpm-5.4.0.orig/configure.ac | ||
13 | +++ rpm-5.4.0/configure.ac | ||
14 | @@ -561,7 +561,6 @@ dnl # platform specific checks | ||
15 | AC_SEARCH_LIBS([strerror],[cposix]) | ||
16 | |||
17 | dnl # standard checks | ||
18 | -AM_C_PROTOTYPES | ||
19 | AC_C_INLINE | ||
20 | AC_C_BIGENDIAN | ||
21 | |||
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.0.bb b/meta/recipes-devtools/rpm/rpm_5.4.0.bb index d79d199970..43999e56a6 100644 --- a/meta/recipes-devtools/rpm/rpm_5.4.0.bb +++ b/meta/recipes-devtools/rpm/rpm_5.4.0.bb | |||
@@ -45,7 +45,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1" | |||
45 | DEPENDS = "bzip2 zlib db openssl elfutils expat libpcre attr acl popt ${extrarpmdeps}" | 45 | DEPENDS = "bzip2 zlib db openssl elfutils expat libpcre attr acl popt ${extrarpmdeps}" |
46 | extrarpmdeps = "python perl file" | 46 | extrarpmdeps = "python perl file" |
47 | extrarpmdeps_virtclass-native = "python-native file-native" | 47 | extrarpmdeps_virtclass-native = "python-native file-native" |
48 | PR = "r37" | 48 | PR = "r38" |
49 | 49 | ||
50 | # rpm2cpio is a shell script, which is part of the rpm src.rpm. It is needed | 50 | # rpm2cpio is a shell script, which is part of the rpm src.rpm. It is needed |
51 | # in order to extract the distribution SRPM into a format we can extract... | 51 | # in order to extract the distribution SRPM into a format we can extract... |
@@ -71,6 +71,7 @@ SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.0-0.20101229.src.rpm;ex | |||
71 | file://rpmdeps-oecore.patch \ | 71 | file://rpmdeps-oecore.patch \ |
72 | file://rpm-resolvedep.patch \ | 72 | file://rpm-resolvedep.patch \ |
73 | file://rpm-respect-arch.patch \ | 73 | file://rpm-respect-arch.patch \ |
74 | file://rpm_fix_for_automake-1.12.patch \ | ||
74 | " | 75 | " |
75 | 76 | ||
76 | # file://rpm-autoconf.patch \ | 77 | # file://rpm-autoconf.patch \ |