-
Notifications
You must be signed in to change notification settings - Fork 705
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix Score-P configure when install paths contains 'yes/no'
- Loading branch information
Showing
7 changed files
with
128 additions
and
6 deletions.
There are no files selected for viewing
98 changes: 98 additions & 0 deletions
98
easybuild/easyconfigs/s/Score-P/Score-P-8.0_fix-path-check.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,98 @@ | ||
In various places paths passed via the commandline are validated that they are not "yes" or "no". | ||
However, that check was too broad, checking for any matching substring in the given path. | ||
This could fail if some folder included "yes" or "no". | ||
Make the check more strict to ensure that we do only abort when "yes" or "no" is actually passed. | ||
|
||
Author: Alexander Grund (TU Dresden) | ||
Ported to upstream patch from build-config/common/m4/afs_external_lib.m4 to the generated configure files. | ||
|
||
diff -ur scorep-8.0-orig/build-backend/configure scorep-8.0/build-backend/configure | ||
--- scorep-8.0-orig/build-backend/configure 2024-11-28 13:53:42.539876288 +0100 | ||
+++ scorep-8.0/build-backend/configure 2024-11-28 13:58:04.917444170 +0100 | ||
@@ -37776,7 +37776,7 @@ | ||
esac ;; #( | ||
set2set3) : | ||
case ${with_libbfd_lib}${with_libbfd_include} in #( | ||
- *yes*|*no*) : | ||
+ yes,*|no,*|*,yes|*,no) : | ||
as_fn_error $? "Both, --with-libbfd-lib and --with-libbfd-include require a <path>." "$LINENO" 5 ;; #( | ||
*) : | ||
|
||
@@ -46006,7 +46006,7 @@ | ||
esac ;; #( | ||
set2set3) : | ||
case ${with_libunwind_lib}${with_libunwind_include} in #( | ||
- *yes*|*no*) : | ||
+ yes,*|no,*|*,yes|*,no) : | ||
as_fn_error $? "Both, --with-libunwind-lib and --with-libunwind-include require a <path>." "$LINENO" 5 ;; #( | ||
*) : | ||
|
||
@@ -56137,7 +56137,7 @@ | ||
esac ;; #( | ||
set2set3) : | ||
case ${with_liblustreapi_lib}${with_liblustreapi_include} in #( | ||
- *yes*|*no*) : | ||
+ yes,*|no,*|*,yes|*,no) : | ||
as_fn_error $? "Both, --with-liblustreapi-lib and --with-liblustreapi-include require a <path>." "$LINENO" 5 ;; #( | ||
*) : | ||
|
||
diff -ur scorep-8.0-orig/build-mpi/configure scorep-8.0/build-mpi/configure | ||
--- scorep-8.0-orig/build-mpi/configure 2024-11-28 13:53:42.542876249 +0100 | ||
+++ scorep-8.0/build-mpi/configure 2024-11-28 13:57:20.805021198 +0100 | ||
@@ -35736,7 +35736,7 @@ | ||
esac ;; #( | ||
set2set3) : | ||
case ${with_libbfd_lib}${with_libbfd_include} in #( | ||
- *yes*|*no*) : | ||
+ yes,*|no,*|*,yes|*,no) : | ||
as_fn_error $? "Both, --with-libbfd-lib and --with-libbfd-include require a <path>." "$LINENO" 5 ;; #( | ||
*) : | ||
|
||
@@ -44343,7 +44343,7 @@ | ||
esac ;; #( | ||
set2set3) : | ||
case ${with_libunwind_lib}${with_libunwind_include} in #( | ||
- *yes*|*no*) : | ||
+ yes,*|no,*|*,yes|*,no) : | ||
as_fn_error $? "Both, --with-libunwind-lib and --with-libunwind-include require a <path>." "$LINENO" 5 ;; #( | ||
*) : | ||
|
||
@@ -53306,7 +53306,7 @@ | ||
esac ;; #( | ||
set2set3) : | ||
case ${with_liblustreapi_lib}${with_liblustreapi_include} in #( | ||
- *yes*|*no*) : | ||
+ yes,*|no,*|*,yes|*,no) : | ||
as_fn_error $? "Both, --with-liblustreapi-lib and --with-liblustreapi-include require a <path>." "$LINENO" 5 ;; #( | ||
*) : | ||
|
||
diff -ur scorep-8.0-orig/build-shmem/configure scorep-8.0/build-shmem/configure | ||
--- scorep-8.0-orig/build-shmem/configure 2024-11-28 13:53:42.541876262 +0100 | ||
+++ scorep-8.0/build-shmem/configure 2024-11-28 13:57:42.765733935 +0100 | ||
@@ -35545,7 +35545,7 @@ | ||
esac ;; #( | ||
set2set3) : | ||
case ${with_libbfd_lib}${with_libbfd_include} in #( | ||
- *yes*|*no*) : | ||
+ yes,*|no,*|*,yes|*,no) : | ||
as_fn_error $? "Both, --with-libbfd-lib and --with-libbfd-include require a <path>." "$LINENO" 5 ;; #( | ||
*) : | ||
|
||
@@ -43965,7 +43965,7 @@ | ||
esac ;; #( | ||
set2set3) : | ||
case ${with_libunwind_lib}${with_libunwind_include} in #( | ||
- *yes*|*no*) : | ||
+ yes,*|no,*|*,yes|*,no) : | ||
as_fn_error $? "Both, --with-libunwind-lib and --with-libunwind-include require a <path>." "$LINENO" 5 ;; #( | ||
*) : | ||
|
||
@@ -52914,7 +52914,7 @@ | ||
esac ;; #( | ||
set2set3) : | ||
case ${with_liblustreapi_lib}${with_liblustreapi_include} in #( | ||
- *yes*|*no*) : | ||
+ yes,*|no,*|*,yes|*,no) : | ||
as_fn_error $? "Both, --with-liblustreapi-lib and --with-liblustreapi-include require a <path>." "$LINENO" 5 ;; #( | ||
*) : | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters