[openfoam] 02/02: Fix compilation.

[Anton Gladky]

This is an automated email from the git hooks/post-receive script.

gladk pushed a commit to branch master
in repository openfoam.

commit 2fe67948b0235b03a9c06383094294a9d2910193
Author: Anton Gladky <gladk at debian.org>
Date:   Tue May 3 22:17:43 2016 +0200

    Fix compilation.
---
 debian/patches/20_yyflex-fix.patch | 103 +++++++++++++++++++++++++++++++++++++
 debian/patches/series              |   1 +
 2 files changed, 104 insertions(+)

diff --git a/debian/patches/20_yyflex-fix.patch b/debian/patches/20_yyflex-fix.patch
new file mode 100644
index 0000000..1e22eda
--- /dev/null
+++ b/debian/patches/20_yyflex-fix.patch
@@ -0,0 +1,103 @@
+Description: Fix linkage with yyflex
+Author: Anton Gladky <gladk at debian.org>
+Last-Update: 2016-05-03
+
+--- openfoam-3.0.1.orig/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
++++ openfoam-3.0.1/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
+@@ -77,11 +77,7 @@ label currentTypei = -1;
+ // Dummy yywrap to keep yylex happy at compile time.
+ // It is called by yylex but is not used as the mechanism to change file.
+ // See <<EOF>>
+-#if YY_FLEX_SUBMINOR_VERSION < 34
+-extern "C" int yywrap()
+-#else
+ int yyFlexLexer::yywrap()
+-#endif
+ {
+     return 1;
+ }
+--- openfoam-3.0.1.orig/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
++++ openfoam-3.0.1/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
+@@ -123,11 +123,7 @@ void uniquify(word& name, HashSet<word>&
+ // Dummy yywrap to keep yylex happy at compile time.
+ // It is called by yylex but is not used as the mechanism to change file.
+ // See <<EOF>>
+-#if YY_FLEX_SUBMINOR_VERSION < 34
+-extern "C" int yywrap()
+-#else
+ int yyFlexLexer::yywrap()
+-#endif
+ {
+     return 1;
+ }
+--- openfoam-3.0.1.orig/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
++++ openfoam-3.0.1/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
+@@ -99,12 +99,7 @@ wordList patchNameIDs(maxZoneID);
+ 
+ // Dummy yywrap to keep yylex happy at compile time.
+ // It is called by yylex but is not used as the mechanism to change file.
+-// See <<EOF>>
+-#if YY_FLEX_SUBMINOR_VERSION < 34
+-extern "C" int yywrap()
+-#else
+ int yyFlexLexer::yywrap()
+-#endif
+ {
+     return 1;
+ }
+--- openfoam-3.0.1.orig/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L
++++ openfoam-3.0.1/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L
+@@ -80,11 +80,7 @@ label nValuesForPatchFaces = 0;
+ // Dummy yywrap to keep yylex happy at compile time.
+ // It is called by yylex but is not used as the mechanism to change file.
+ // See <<EOF>>
+-#if YY_FLEX_SUBMINOR_VERSION < 34
+-extern "C" int yywrap()
+-#else
+ int yyFlexLexer::yywrap()
+-#endif
+ {
+     return 1;
+ }
+--- openfoam-3.0.1.orig/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatASCII.L
++++ openfoam-3.0.1/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatASCII.L
+@@ -50,11 +50,7 @@ int yyFlexLexer::yylex()
+ // It is called by yylex but is not used as the mechanism to change file.
+ // See <<EOF>>
+ //! \cond dummy
+-#if YY_FLEX_SUBMINOR_VERSION < 34
+-extern "C" int yywrap()
+-#else
+ int yyFlexLexer::yywrap()
+-#endif
+ {
+     return 1;
+ }
+--- openfoam-3.0.1.orig/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinLexer.L
++++ openfoam-3.0.1/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinLexer.L
+@@ -54,11 +54,7 @@ int yyFlexLexer::yylex()
+ // It is called by yylex but is not used as the mechanism to change file.
+ // See <<EOF>>
+ //! \cond dummy
+-#if YY_FLEX_SUBMINOR_VERSION < 34
+-extern "C" int yywrap()
+-#else
+ int yyFlexLexer::yywrap()
+-#endif
+ {
+     return 1;
+ }
+--- openfoam-3.0.1.orig/src/triSurface/triSurface/interfaces/STL/readSTLASCII.L
++++ openfoam-3.0.1/src/triSurface/triSurface/interfaces/STL/readSTLASCII.L
+@@ -55,11 +55,7 @@ int yyFlexLexer::yylex()
+ // It is called by yylex but is not used as the mechanism to change file.
+ // See <<EOF>>
+ //! \cond dummy
+-#if YY_FLEX_SUBMINOR_VERSION < 34
+-extern "C" int yywrap()
+-#else
+ int yyFlexLexer::yywrap()
+-#endif
+ {
+     return 1;
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 7d83512..1f92e72 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 10_fix_etc_path.patch
+20_yyflex-fix.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/openfoam.git