From 1ee5b980f2d702928056e2d70c68b6d9bf55c552 Mon Sep 17 00:00:00 2001
From: Christoph Niethammer <niethammer@hlrs.de>
Date: Tue, 9 Aug 2016 12:24:27 +0000
Subject: [PATCH] Include patch for Opari 2 issues with Fortran line breaks.

---
 packages/performance/scorep/scorep-2.0.2      |  4 ++
 .../scorep/scorep-2.0.2-0001.patch            | 42 +++++++++++++++++++
 2 files changed, 46 insertions(+)
 create mode 100644 packages/performance/scorep/scorep-2.0.2-0001.patch

diff --git a/packages/performance/scorep/scorep-2.0.2 b/packages/performance/scorep/scorep-2.0.2
index f2ca942..8b8619a 100755
--- a/packages/performance/scorep/scorep-2.0.2
+++ b/packages/performance/scorep/scorep-2.0.2
@@ -49,3 +49,7 @@ then
 	CONFIGURE_OPTS+=" --with-papi-header=$PAPI_BASE/include --with-papi-lib=$PAPI_BASE/lib "
 fi
 
+src_prepare () {
+	patch -p1 < $SCLASS_DIR/$SCLASSFILE-0001.patch
+}
+
diff --git a/packages/performance/scorep/scorep-2.0.2-0001.patch b/packages/performance/scorep/scorep-2.0.2-0001.patch
new file mode 100644
index 0000000..ca4654e
--- /dev/null
+++ b/packages/performance/scorep/scorep-2.0.2-0001.patch
@@ -0,0 +1,42 @@
+Index: src/opari/opari2_parser_f.cc
+===================================================================
+--- src/opari/opari2_parser_f.cc	(revision 1748)
++++ src/opari/opari2_parser_f.cc	(working copy)
+@@ -304,6 +304,12 @@
+     return result;
+ }
+ 
++bool
++OPARI2_FortranParser::is_empty_line( void )
++{
++    return m_lowline.find_first_not_of( " \t" ) == string::npos;
++}
++
+ /**@brief check if this line is a comment line*/
+ bool
+ OPARI2_FortranParser::is_comment_line( void )
+@@ -816,7 +822,7 @@
+                 found_continuation_line = true;
+                 m_sentinel              = prev_sentinel;
+             }
+-            else if ( found_continuation_line )
++            else if ( found_continuation_line && !is_empty_line() )
+             {
+                 cerr << m_curr_file << ":" << m_lineno - 1
+                      << ": ERROR: missing continuation line\n";
+Index: src/opari/opari2_parser_f.h
+===================================================================
+--- src/opari/opari2_parser_f.h	(revision 1748)
++++ src/opari/opari2_parser_f.h	(working copy)
+@@ -98,6 +98,10 @@
+     bool
+     is_sub_unit_header( void );
+ 
++/**@brief check if this line is empty*/
++    bool
++    is_empty_line( void );
++
+ /**@brief check if this line is a comment line*/
+     bool
+     is_comment_line( void );
+