diff options
| author | Ladar Levison <ladar@lavabit.com> | 2020-06-10 17:11:48 +0300 |
|---|---|---|
| committer | Ladar Levison <ladar@lavabit.com> | 2020-06-10 17:11:48 +0300 |
| commit | acf80559cdd0a5394f689d35be02e22255103d63 (patch) | |
| tree | c0bd4287d99c328d1420055ee1872f8d52c094e9 | |
| parent | c4257062ff503977fd9358046d5aeb2de679c76c (diff) | |
Fix the magmad.so load test on Debian distros.
| -rwxr-xr-x | dev/scripts/builders/build.lib.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/dev/scripts/builders/build.lib.sh b/dev/scripts/builders/build.lib.sh index f3d80f1c..707c125c 100755 --- a/dev/scripts/builders/build.lib.sh +++ b/dev/scripts/builders/build.lib.sh @@ -2722,13 +2722,13 @@ load() { sed -i -e "s/\"dkim_getsighdrx\"/\"dkim_getsighdr\"/g" magma.open.symbols.c; error # Compile the source files. If an error occurs at compile time it is probably because we have a mismatch somewhere. - gcc -D_REENTRANT -D_GNU_SOURCE -DHAVE_NS_TYPE -D_LARGEFILE64_SOURCE $M_SYM_INCLUDES $M_SO \ + gcc -D_REENTRANT -D_GNU_SOURCE -DHAVE_NS_TYPE -D_LARGEFILE64_SOURCE $M_SYM_INCLUDES -L$M_PROJECT_ROOT -l:magmad.so \ -g3 -rdynamic -Wall -Wextra -Werror -o magma.open.check magma.open.check.c magma.open.symbols.c -ldl # If errors are generated from invalid symbols, this should print out the specific lines that are invalid. if [ $? -ne 0 ]; then - LNS=`gcc -D_REENTRANT -D_GNU_SOURCE -DHAVE_NS_TYPE -D_LARGEFILE64_SOURCE $M_SYM_INCLUDES $M_SO -g3 -rdynamic -Wall -Wextra -Werror \ + LNS=`gcc -D_REENTRANT -D_GNU_SOURCE -DHAVE_NS_TYPE -D_LARGEFILE64_SOURCE $M_SYM_INCLUDES -L$M_PROJECT_ROOT -l:magmad.so -g3 -rdynamic -Wall -Wextra -Werror \ -o magma.open.check magma.open.check.c magma.open.symbols.c -ldl 2>&1 | grep "magma.open.symbols.c" | awk -F':' '{ print $2 }' | \ grep "[0-9*]" | awk '{print $1 ", " }' | sort -gu | uniq | tr -d "\n" | sed "s/, $//g"` @@ -2737,7 +2737,7 @@ load() { printf "\n\nPrinting the invalid symbols...\n\n" - LNS=`gcc -D_REENTRANT -D_GNU_SOURCE -DHAVE_NS_TYPE -D_LARGEFILE64_SOURCE $M_SYM_INCLUDES $M_SO -g3 -rdynamic -Wall -Wextra -Werror \ + LNS=`gcc -D_REENTRANT -D_GNU_SOURCE -DHAVE_NS_TYPE -D_LARGEFILE64_SOURCE $M_SYM_INCLUDES -L$M_PROJECT_ROOT -l:magmad.so -g3 -rdynamic -Wall -Wextra -Werror \ -o magma.open.check magma.open.check.c magma.open.symbols.c -ldl 2>&1 | grep "magma.open.symbols.c" | awk -F':' '{ print $2 }' | \ grep "[0-9*]" | awk '{print $1 "p;" }' | sort -gu | uniq | tr -d "\n"` |