util: Install scons 3.1 from pip in gcn-gpu dockerfile

A previous commit updated the minimum required version of scons to 3.0

The gcn Dockerfile previously installed scons from apt, which installed
scons 2.4, as the Dockerfile is based on Ubuntu 16

This patch installs scons through pip, which installs scons 3.1

Change-Id: I4f731b301f97e25c730df26afde20ae1cdfaa1b3
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/34075
Reviewed-by: Matt Sinclair <mattdsinclair@gmail.com>
Reviewed-by: Daniel Gerzhoy <daniel.gerzhoy@gmail.com>
Reviewed-by: Jason Lowe-Power <power.jg@gmail.com>
Reviewed-by: Matthew Poremba <matthew.poremba@amd.com>
Maintainer: Matt Sinclair <mattdsinclair@gmail.com>
Maintainer: Jason Lowe-Power <power.jg@gmail.com>
Tested-by: kokoro <noreply+kokoro@google.com>

diff --git a/util/dockerfiles/gcn-gpu/Dockerfile b/util/dockerfiles/gcn-gpu/Dockerfile
index 4c17b4208594ba81d11b5a3b6d04f9c9cfd6b115..065dad63da14788d2340104dbb7dd0d2a4decf79 100644 (file)
--- a/util/dockerfiles/gcn-gpu/Dockerfile
+++ b/util/dockerfiles/gcn-gpu/Dockerfile
@@ -13,7 +13,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     git \
     ca-certificates \
     m4 \
-    scons \
     zlib1g \
     zlib1g-dev \
     libprotobuf-dev \
@@ -24,6 +23,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     python \
     python-yaml \
     python-six \
+    python-pip \
     wget \
     libpci3 \
     libelf1 \
@@ -37,6 +37,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     libpng12-dev \
     libelf-dev
 
+RUN python -m pip install -U pip && \
+    python -m pip install -U setuptools scons
+
 ARG gem5_dist=http://dist.gem5.org/dist/develop
 
 # Install ROCm 1.6 binaries