From d3ec217e602281cf8d66e2dd6d007c62cbe7fdfb Mon Sep 17 00:00:00 2001 From: Weston Date: Mon, 4 May 2020 08:48:31 -0700 Subject: [PATCH] fix for ubuntu 20.04 (#748) --- requirements.txt | 1 + setup.sh | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 5c64be303..415bb1c4f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,3 +12,4 @@ pygments capstone==4.0.1 enum34 pytest +testresources diff --git a/setup.sh b/setup.sh index 88b387bf5..c8a79f42e 100755 --- a/setup.sh +++ b/setup.sh @@ -20,7 +20,9 @@ osx() { install_apt() { sudo apt-get update || true - sudo apt-get -y install gdb python-dev python3-dev python-pip python3-pip libglib2.0-dev libc6-dbg + # This breaks Ubuntu 20.04, but is probably still needed for older version + sudo apt-get -y python-pip || true + sudo apt-get -y install gdb python-dev python3-dev python3-pip libglib2.0-dev libc6-dbg if uname -m | grep x86_64 > /dev/null; then sudo apt-get -y install libc6-dbg:i386 || true