From 160a7ea742de5abae27e21548cff23bcfeafd1c1 Mon Sep 17 00:00:00 2001
From: Jason Hiser <jdhiser@gmail.com>
Date: Fri, 5 Oct 2018 16:07:05 +0000
Subject: [PATCH] support to detect 32 v 64bit and get the right library
Former-commit-id: a9e86d7ab4d30f43e54d82081449fff2130ff785
---
plugins_install/diehard.sh | 22 ++++++++++++++++------
1 file changed, 16 insertions(+), 6 deletions(-)
diff --git a/plugins_install/diehard.sh b/plugins_install/diehard.sh
index cd9ab70da..e052b12c2 100755
--- a/plugins_install/diehard.sh
+++ b/plugins_install/diehard.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-if [ ! -f $CFAR_HOME/DieHard/src/libdiehard.so ]; then
+if [ ! -f $CFAR_HOME/DieHard/src/libdiehard-4k-x64.so ]; then
echo "ERROR: DieHard library not built/found" | tee warning.txt
exit 1
fi
@@ -23,22 +23,32 @@ case $key in
esac
done
+file a.ncexe |grep -q "64-bit"
+
+if (file a.ncexe |grep -q "64-bit") ; then
+ echo "Detected 64-bit binary"
+ ext=x64
+else
+ echo "Detected 32-bit binary"
+ ext=x32
+fi
+
if [ -z "$seq" ]; then
- cp $CFAR_HOME/DieHard/src/libdiehard.so libheaprand.so
+ cp $CFAR_HOME/DieHard/src/libdiehard-32k-$ext.so libheaprand.so
else
- if [ ! -f $CFAR_HOME/DieHard/src/libdiehard-4k.so ]; then
+ if [ ! -f $CFAR_HOME/DieHard/src/libdiehard-4k-$ext.so ]; then
echo "ERROR: DieHard library 4k not built/found" | tee warning.txt
exit 1
fi
- if [ ! -f $CFAR_HOME/DieHard/src/libdiehard-32k.so ]; then
+ if [ ! -f $CFAR_HOME/DieHard/src/libdiehard-32k-$ext.so ]; then
echo "ERROR: DieHard library 32k not built/found" | tee warning.txt
exit 1
fi
if [ $(expr ${seq} % 2) = 0 ]; then
- cp $CFAR_HOME/DieHard/src/libdiehard-32k.so libheaprand.so
+ cp $CFAR_HOME/DieHard/src/libdiehard-32k-$ext.so libheaprand.so
else
- cp $CFAR_HOME/DieHard/src/libdiehard-4k.so libheaprand.so
+ cp $CFAR_HOME/DieHard/src/libdiehard-4k-$ext.so libheaprand.so
fi
fi
--
GitLab