TPL: One more try. Use git apply; fix whitespace

tokusanya · Aug 14, 2024 · c05a057 · c05a057
1 parent e7606d3
commit c05a057
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/TPL/adios2/0001-Fix-ordering-in-flex_target-command.patch b/TPL/adios2/0001-Fix-ordering-in-flex_target-command.patch
@@ -17,7 +17,7 @@ index cbc59f5..1bebf6c 100644
        toolkit/derived/parser/lexer.l
 -      COMPILE_FLAGS "-o lexer.cpp --header-file=lexer.h" 
        ${CMAKE_CURRENT_BINARY_DIR}/lexer.cpp
-+      COMPILE_FLAGS "--header-file=lexer.h" 
++      COMPILE_FLAGS "--header-file=lexer.h"
        DEFINES_FILE ${CMAKE_CURRENT_BINARY_DIR}/lexer.h)
      ADD_FLEX_BISON_DEPENDENCY(MyScanner MyParser)
    endif()

diff --git a/install-tpl.sh b/install-tpl.sh
@@ -866,7 +866,7 @@ then
         then
             echo "${txtgrn}+++ Configuring, Building, and Installing...${txtrst}"
             cd ADIOS2 || exit
-	    patch < ../0001-Fix-ordering-in-flex_target-command.patch
+	    git apply ../0001-Fix-ordering-in-flex_target-command.patch
 	    git status
             rm -rf build
             mkdir build