Fix automatic unicornafl bindings install for python
MODIFY
unicorn_mode/UNICORNAFL_VERSION
unicorn_mode/UNICORNAFL_VERSION
-6e00ceac
+2df75f3e

MODIFY
unicorn_mode/build_unicorn_support.sh
unicorn_mode/build_unicorn_support.sh
@@ -117,21 +117,21 @@ done
# some python version should be available now
PYTHONS="`command -v python3` `command -v python` `command -v python2`"
-SETUPTOOLS_FOUND=0
+PIP_FOUND=0
for PYTHON in $PYTHONS ; do
- if $PYTHON -c "import setuptools" ; then
+ if $PYTHON -c "import pip" ; then
- SETUPTOOLS_FOUND=1
+ PIP_FOUND=1
PYTHONBIN=$PYTHON
break
fi
done
-if [ "0" = $SETUPTOOLS_FOUND ]; then
+if [ "0" = $PIP_FOUND ]; then
- echo "[-] Error: Python setup-tools not found. Run 'sudo apt-get install python-setuptools', or install python3-setuptools, or run '$PYTHONBIN -m ensurepip', or create a virtualenv, or ..."
+ echo "[-] Error: Python pip not found. Run 'sudo apt-get install python-pip', or install python3-pip, or run '$PYTHONBIN -m ensurepip', or create a virtualenv, or ..."
PREREQ_NOTFOUND=1
fi
@@ -199,22 +199,22 @@ echo "[*] Installing Unicorn python bindings..."
cd unicorn/bindings/python || exit 1
if [ -z "$VIRTUAL_ENV" ]; then
echo "[*] Info: Installing python unicornafl using --user"
- THREADS=$CORES $PYTHONBIN setup.py install --user --force --prefix=|| exit 1
+ THREADS=$CORES $PYTHONBIN -m pip install --user --force .|| exit 1
else
echo "[*] Info: Installing python unicornafl to virtualenv: $VIRTUAL_ENV"
- THREADS=$CORES $PYTHONBIN setup.py install --force || exit 1
+ THREADS=$CORES $PYTHONBIN -m pip install --force .|| exit 1
fi
cd ../../../
echo "[*] Installing Unicornafl python bindings..."
cd bindings/python || exit 1
if [ -z "$VIRTUAL_ENV" ]; then
echo "[*] Info: Installing python unicornafl using --user"
- THREADS=$CORES $PYTHONBIN setup.py install --user --force --prefix=|| exit 1
+ THREADS=$CORES $PYTHONBIN -m pip install --user --force .|| exit 1
else
echo "[*] Info: Installing python unicornafl to virtualenv: $VIRTUAL_ENV"
- THREADS=$CORES $PYTHONBIN setup.py install --force || exit 1
+ THREADS=$CORES $PYTHONBIN -m pip install --force .|| exit 1
fi
-echo '[*] If needed, you can (re)install the bindings from `./unicornafl/bindings/python` using `python setup.py install`'
+echo '[*] If needed, you can (re)install the bindings in `./unicornafl/bindings/python` using `pip install --force .`'
cd ../../ || exit 1

MODIFY
unicorn_mode/unicornafl
unicorn_mode/unicornafl
-Subproject commit 6e00ceac6fd5627e42e1858c543c84f2fbdaedda
+Subproject commit 2df75f3e1045367cab95fe3471191b38c1a9f79e

Fix automatic unicornafl bindings install for python