summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorBogdan Marinescu <bogdan.a.marinescu@intel.com>2012-12-21 14:38:39 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-26 11:34:09 +0000
commit26b486f4b01e0bc693be03e707e2e46825c7c264 (patch)
tree65dca189da0638dc261de6eaf6e48ad3fb715b42 /meta
parent26dfd24037d0ebc639dc3435b7e97a1f43d53740 (diff)
downloadpoky-26b486f4b01e0bc693be03e707e2e46825c7c264.tar.gz
rpm: remove declaration of "sykcparse"
This is needed so rpm compiles with the latest update of bison (2.7), otherwise compilations ends with a "function already declared" error. (From OE-Core rev: 6563a2a5ff7626177ea2cc68eda96e0caf2d320f) Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-remove-sykcparse-decl.patch14
-rw-r--r--meta/recipes-devtools/rpm/rpm_5.4.9.bb3
2 files changed, 16 insertions, 1 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-remove-sykcparse-decl.patch b/meta/recipes-devtools/rpm/rpm/rpm-remove-sykcparse-decl.patch
new file mode 100644
index 0000000000..89ee41001d
--- /dev/null
+++ b/meta/recipes-devtools/rpm/rpm/rpm-remove-sykcparse-decl.patch
@@ -0,0 +1,14 @@
1diff --git a/syck/lib/syck.h b/syck/lib/syck.h
2index 04be1d9..73830a6 100644
3--- a/syck/lib/syck.h
4+++ b/syck/lib/syck.h
5@@ -621,9 +621,6 @@ long syck_seq_count( SyckNode *seq )
6 */
7 void syckerror( char *msg )
8 /*@*/;
9-int syckparse( void * )
10- /*@globals fileSystem @*/
11- /*@modifies fileSystem @*/;
12 /* XXX union YYSTYPE *sycklval has issues on Mac OS X. */
13 int sycklex( void *_sycklval, SyckParser *parser )
14 /*@modifies _sycklval, parser @*/;
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.9.bb b/meta/recipes-devtools/rpm/rpm_5.4.9.bb
index be76f2470a..088fc66754 100644
--- a/meta/recipes-devtools/rpm/rpm_5.4.9.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4.9.bb
@@ -43,7 +43,7 @@ LICENSE = "LGPLv2.1"
43LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1" 43LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
44 44
45DEPENDS = "libpcre attr acl popt ossp-uuid file bison-native" 45DEPENDS = "libpcre attr acl popt ossp-uuid file bison-native"
46PR = "r59" 46PR = "r60"
47 47
48# rpm2cpio is a shell script, which is part of the rpm src.rpm. It is needed 48# rpm2cpio is a shell script, which is part of the rpm src.rpm. It is needed
49# in order to extract the distribution SRPM into a format we can extract... 49# in order to extract the distribution SRPM into a format we can extract...
@@ -84,6 +84,7 @@ SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.9-0.20120508.src.rpm;ex
84 file://python-rpm-rpmsense.patch \ 84 file://python-rpm-rpmsense.patch \
85 file://rpm-reloc-macros.patch \ 85 file://rpm-reloc-macros.patch \
86 file://rpm-platform2.patch \ 86 file://rpm-platform2.patch \
87 file://rpm-remove-sykcparse-decl.patch \
87 " 88 "
88 89
89# Uncomment the following line to enable platform score debugging 90# Uncomment the following line to enable platform score debugging