changes made in version 1.0 merged/added

- Issue #176, MR !149 relocatable modulecmd
- Issue #175, MR !148 new logmessage format
- Issue #173, MR !146 additional dirs in search path of CMake and pkgconfig
- Issue #172, MR !145: fix in reading legacy variants files
This commit is contained in:
2022-12-05 15:35:26 +01:00
parent 07d22cf1f2
commit 4ee53d12fa
5 changed files with 64 additions and 94 deletions
+7
View File
@@ -367,6 +367,9 @@ bash_expand(){
build_modules_legacy() {
find_variants_files(){
shopt -q nullglob || :
local -i nullglob_set=$?
local files=( "${BUILDBLOCK_DIR}"/*/"${BNAME_VARIANTS}"\.${opt_system} )
files+=( "${BUILDBLOCK_DIR}"/*/"${BNAME_VARIANTS}.$(uname -s)" )
local f
@@ -375,6 +378,10 @@ build_modules_legacy() {
|| [[ -e "${f}.$(uname -s)" ]] \
|| files+=( "$f" )
done
if (( ${#files[@]} == 0 )); then
std::die 2 "No suitable variants file found!"
fi
(( nullglob_set == 1 )) && shopt -u nullglob
std::upvar "$1" "${files[@]}"
}