Patchwork [2/2] rpm: remove declaration of "sykcparse"

login
register
mail settings
Submitter Bogdan Marinescu
Date Dec. 21, 2012, 12:38 p.m.
Message ID <1356093519-27312-3-git-send-email-bogdan.a.marinescu@intel.com>
Download mbox | patch
Permalink /patch/41431/
State Accepted
Commit 6563a2a5ff7626177ea2cc68eda96e0caf2d320f
Headers show

Comments

Bogdan Marinescu - Dec. 21, 2012, 12:38 p.m.
This is needed so rpm compiles with the latest update of bison
(2.7), otherwise compilations ends with a "function already declared"
error.

Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com>
---
 .../rpm/rpm/rpm-remove-sykcparse-decl.patch              |   14 ++++++++++++++
 meta/recipes-devtools/rpm/rpm_5.4.9.bb                   |    3 ++-
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-remove-sykcparse-decl.patch

Patch

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 0000000..89ee410
--- /dev/null
+++ b/meta/recipes-devtools/rpm/rpm/rpm-remove-sykcparse-decl.patch
@@ -0,0 +1,14 @@ 
+diff --git a/syck/lib/syck.h b/syck/lib/syck.h
+index 04be1d9..73830a6 100644
+--- a/syck/lib/syck.h
++++ b/syck/lib/syck.h
+@@ -621,9 +621,6 @@ long syck_seq_count( SyckNode *seq )
+  */
+ void syckerror( char *msg )
+ 	/*@*/;
+-int syckparse( void * )
+-	/*@globals fileSystem @*/
+-	/*@modifies fileSystem @*/;
+ /* XXX union YYSTYPE *sycklval has issues on Mac OS X. */
+ int sycklex( void *_sycklval, SyckParser *parser )
+ 	/*@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 be76f24..088fc66 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"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
 
 DEPENDS = "libpcre attr acl popt ossp-uuid file bison-native"
-PR = "r59"
+PR = "r60"
 
 # rpm2cpio is a shell script, which is part of the rpm src.rpm.  It is needed
 # 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
 	   file://python-rpm-rpmsense.patch \
 	   file://rpm-reloc-macros.patch \
 	   file://rpm-platform2.patch \
+     file://rpm-remove-sykcparse-decl.patch \
 	  "
 
 # Uncomment the following line to enable platform score debugging