[packages/apparmor-parser] - fix building with bison 3.0

baggins baggins at pld-linux.org
Mon Nov 4 22:11:28 CET 2013


commit 921e93771bed0c159a8a1b610d24db0265b1c311
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Nov 4 22:11:16 2013 +0100

    - fix building with bison 3.0

 apparmor-parser.spec |  2 ++
 bison3.patch         | 10 ++++++++++
 2 files changed, 12 insertions(+)
---
diff --git a/apparmor-parser.spec b/apparmor-parser.spec
index dc456ec..947df32 100644
--- a/apparmor-parser.spec
+++ b/apparmor-parser.spec
@@ -15,6 +15,7 @@ Source0:	http://launchpad.net/apparmor/2.8/%{version}/+download/apparmor-%{versi
 # Source0-md5:	bcc6bb56630b007d4ea5c9affe9d750d
 Source1:	%{name}.init
 Patch0:		%{name}-pld.patch
+Patch1:		bison3.patch
 URL:		http://apparmor.wiki.kernel.org/
 BuildRequires:	bison
 BuildRequires:	flex
@@ -45,6 +46,7 @@ SubDomain.
 %prep
 %setup -q -n apparmor-%{version}
 %patch0 -p0
+%patch1 -p1
 
 %build
 %{__make} -j1 -C parser \
diff --git a/bison3.patch b/bison3.patch
new file mode 100644
index 0000000..54cfb3b
--- /dev/null
+++ b/bison3.patch
@@ -0,0 +1,10 @@
+--- apparmor-2.8.2/parser/libapparmor_re/parse.y~	2012-02-24 13:20:46.000000000 +0100
++++ apparmor-2.8.2/parser/libapparmor_re/parse.y	2013-11-04 21:52:32.975269560 +0100
+@@ -57,6 +56,7 @@
+ 
+ %pure-parser
+ /* %error-verbose */
++%lex-param {YYLEX_PARAM}
+ %parse-param {Node **root}
+ %parse-param {const char *text}
+ %name-prefix = "regex_"
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/apparmor-parser.git/commitdiff/921e93771bed0c159a8a1b610d24db0265b1c311



More information about the pld-cvs-commit mailing list