arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Run autoupdate and libtoolize if available

pull/696/head
Jeffrey Walton 2018-07-27 16:51:32 -04:00
parent f201bc9493
commit ed91b278bb
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
TestScripts/cryptest-autotools.sh
View File

@ -58,15 +58,24 @@ fi
# mv libcryptopp.pc.in.fixed libcryptopp.pc.in # mv libcryptopp.pc.in.fixed libcryptopp.pc.in
#fi #fi
# Run autoreconf twice on failure. Also see
# https://github.com/tracebox/tracebox/issues/57
mkdir -p m4/ mkdir -p m4/
if [[ ! -z $(command -v autoupdate) ]]; then if [[ ! -z $(command -v autoupdate) ]]; then
autoupdate autoupdate
fi fi
if ! autoreconf --force --install --warnings=all; then if [[ ! -z $(command -v libtoolize) ]]; then
echo "autoreconf failed" libtoolize
[[ "$0" = "${BASH_SOURCE[0]}" ]] && exit 1 || return 1 fi
if ! autoreconf -vfi --warnings=all; then
if ! autoreconf -vfi; then
echo "autoreconf failed"
[[ "$0" = "${BASH_SOURCE[0]}" ]] && exit 1 || return 1
fi
fi fi
if ! ./configure; then if ! ./configure; then

4
padlkrng.cpp
View File

@ -52,9 +52,9 @@ void PadlockRNG::GenerateBlock(byte *output, size_t size)
: "=g" (m_msr) : "g" (m_buffer.data()), "g" (m_divisor) : "=g" (m_msr) : "g" (m_buffer.data()), "g" (m_divisor)
#if (CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X64) #if (CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X64)
: "rax", "rbx", "rdx", "rdi", "cc" : "rax", "rdx", "rdi", "cc"
#else #else
: "eax", "ebx", "edx", "edi", "cc" : "eax", "edx", "edi", "cc"
#endif #endif
); );