Skip to content
Snippets Groups Projects
Commit 3fbdb8bf authored by Izzard, Robert Dr (Maths & Physics)'s avatar Izzard, Robert Dr (Maths & Physics)
Browse files

add extra message to meson.build

add error case in binary_c-config when shared library cannot be found

sync latest perl mods
parent 412278e2
No related branches found
No related tags found
No related merge requests found
Showing
with 2382 additions and 2365 deletions
......@@ -28,8 +28,16 @@ BIN="$DIR/binary_c"
# if it's not executable, fail
if [[ ! -x "$BIN" ]];then
echo -e "\e[91mLooked for binary_c at $BIN but could not find an executable there :( Have you built binary_c? Is this config script located in the binary_c directory?\e[39m"
exit
fi
# check binary_c works, e.g. it will fail if the shared
# libraries are not found
SHLIB_LOAD_CHECK="$("$BIN" dumpversion 2>&1)"
if [[ $SHLIB_LOAD_CHECK =~ "error" ]]; then
echo -e "\e[91m"
echo "Looked for binary_c at $BIN but could not find an executable there :( Have you built binary_c? Is this config script located in the binary_c directory?"
echo -e "There was an error loading binary_c (\e[93m$SHLIB_LOAD_CHECK\e[91m) because it cannot find a shared library : please check that the LD_LIBRARY_PATH environment variable is pointing to the directory in which you store your shared libraries."
echo -e "\e[39m"
exit
fi
......@@ -40,7 +48,9 @@ DEFAULTS="$BIN list_args"
GREP="grep"
TR="tr"
SED="sed"
LDD=`which ldd`
LDD=$(which ldd)
# help string
HELP=$(cat <<-EOHELP
Usage:
......@@ -161,7 +171,7 @@ while (( $# )); do
;;
--ldd|-ldd|ldd)
# show dependencies
$LDD $BIN | $SED -e 's/^[[:space:]]*//'
$LDD "$BIN" | $SED -e 's/^[[:space:]]*//'
shift
;;
--svn_url|-svn_url|svn_url)
......
Source diff could not be displayed: it is too large. Options to address this: view the blob.
......@@ -521,6 +521,7 @@ endforeach
incdirs += [ my_incdirs ]
############################################################
# features which are converted into preprocessor flags (-D)
#
......@@ -645,6 +646,7 @@ cflags_quoted = '-DCFLAGS=' + ''.join(['"', cflags_quoted , '"']) # surround in
cc_quoted = '-DCC="' + compiler.get_id() + '"'
ld_quoted = '-DLD="' + compiler.get_id() + '"'
incdirs_quoted = '-DINCDIRS=' + ''.join(['"-I', ' -I'.join(absolute_incdirs),'"']) # make -I... -I...
message('INCDIRS=' + incdirs_quoted)
incdirs_quoted = '_slash_'.join(incdirs_quoted.split('/')) # deslash (convert / to _slash_)
libdirs_quoted = '-DLIBDIRS=' + ''.join(['"-L', ' -L'.join(libdirs),'"']) # make -L... -L...
message('LIBDIRS=' + libdirs_quoted)
......
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment