From 0ced1ba96254587576d651cdd0412e1839250b9fc27da3a05d5083e6c6d856aa Mon Sep 17 00:00:00 2001 From: "Michal Hrusecky (old before rename to _miska_)" Date: Fri, 4 Jan 2013 12:05:22 +0000 Subject: [PATCH] - fixed compilation issues with bison OBS-URL: https://build.opensuse.org/package/show/server:database/unixODBC?expand=0&rev=23 --- unixODBC-2.3.1-bison.patch | 22 ++++++++++++++++++++++ unixODBC.changes | 5 +++++ unixODBC.spec | 4 +++- 3 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 unixODBC-2.3.1-bison.patch diff --git a/unixODBC-2.3.1-bison.patch b/unixODBC-2.3.1-bison.patch new file mode 100644 index 0000000..a23a035 --- /dev/null +++ b/unixODBC-2.3.1-bison.patch @@ -0,0 +1,22 @@ +Index: Drivers/nn/yyparse.y +=================================================================== +--- Drivers/nn/yyparse.y.orig ++++ Drivers/nn/yyparse.y +@@ -36,7 +36,7 @@ static char sccsid[] + # define yylex() nnsql_yylex(&yylval, pyyenv) + #endif + +-#define yyparse(x) nnsql_yyparse (pyyenv) ++#define yyparse(x) nnsql_yyparse (yyenv_t* pyyenv) + #define yyerror(msg) nnsql_yyerror (pyyenv, msg) + #define SETYYERROR(env, code) { env->pstmt->errcode = code; \ + env->pstmt->errpos = env->errpos;} +@@ -1197,7 +1197,7 @@ static int add_ins_value( yystmt_t* pstm + { + if( !idx ) + { +- MEM_FREE(pstmt->ins_values) ++ MEM_FREE(pstmt->ins_values); + pstmt->ins_values = (node_t*)MEM_ALLOC( FILTER_CHUNK_SIZE * sizeof(node_t)); + } + else if( ! idx%FILTER_CHUNK_SIZE ) diff --git a/unixODBC.changes b/unixODBC.changes index 6229d1b..3d59c13 100644 --- a/unixODBC.changes +++ b/unixODBC.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jan 4 13:02:10 CET 2013 - mhrusecky@suse.cz + +- fixed compilation issues with bison + ------------------------------------------------------------------- Tue Nov 27 09:04:52 UTC 2012 - cfarrell@suse.com diff --git a/unixODBC.spec b/unixODBC.spec index aa34bd3..042653e 100644 --- a/unixODBC.spec +++ b/unixODBC.spec @@ -1,7 +1,7 @@ # # spec file for package unixODBC # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -44,6 +44,7 @@ Patch6: unixODBC-nonvoid.patch Patch7: unixODBC-gccwarnings.patch Patch10: %{name}-2.3.1-libodbcinst-exports.patch Patch13: %{name}-2.3.1-uninitialized.patch +Patch15: %{name}-2.3.1-bison.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %package devel @@ -88,6 +89,7 @@ Authors: %patch7 %patch10 %patch13 +%patch15 install -m 644 %{S:1} . %build