From b3719766f5567514a6b44d933228be4c255ee388 Mon Sep 17 00:00:00 2001 From: Ciro Santilli Date: Fri, 18 Sep 2020 12:12:54 +0100 Subject: [PATCH] util: add pkg-config to ubuntu all-dependencies Dockerfiles Without this, HDF5 is not built, e.g. a run such as http://jenkins.gem5.org/job/Nightly/68/console contains: Checking for hdf5-serial using pkg-config... pkg-config not found Checking for hdf5 using pkg-config... pkg-config not found Checking for H5Fcreate("", 0, 0, 0) in C library hdf5... (cached) no Warning: Couldn't find any HDF5 C++ libraries. Disabling HDF5 support. This is done to increase coverage a bit, and serve as dependency documentation to users. Change-Id: Ibf820a3aa76c29eeee1201646924ee181615a162 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/34777 Reviewed-by: Jason Lowe-Power Maintainer: Jason Lowe-Power Tested-by: kokoro --- util/dockerfiles/ubuntu-18.04_all-dependencies/Dockerfile | 2 +- util/dockerfiles/ubuntu-20.04_all-dependencies/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/util/dockerfiles/ubuntu-18.04_all-dependencies/Dockerfile b/util/dockerfiles/ubuntu-18.04_all-dependencies/Dockerfile index 282805dfa..1259f2e53 100644 --- a/util/dockerfiles/ubuntu-18.04_all-dependencies/Dockerfile +++ b/util/dockerfiles/ubuntu-18.04_all-dependencies/Dockerfile @@ -31,4 +31,4 @@ RUN apt -y upgrade RUN apt -y install build-essential git m4 scons zlib1g zlib1g-dev \ libprotobuf-dev protobuf-compiler libprotoc-dev libgoogle-perftools-dev \ python-dev python python-six doxygen libboost-all-dev libhdf5-serial-dev \ - python-pydot libpng-dev libelf-dev + python-pydot libpng-dev libelf-dev pkg-config diff --git a/util/dockerfiles/ubuntu-20.04_all-dependencies/Dockerfile b/util/dockerfiles/ubuntu-20.04_all-dependencies/Dockerfile index 283d3568a..3facf7e26 100644 --- a/util/dockerfiles/ubuntu-20.04_all-dependencies/Dockerfile +++ b/util/dockerfiles/ubuntu-20.04_all-dependencies/Dockerfile @@ -32,4 +32,4 @@ RUN apt -y upgrade RUN apt -y install build-essential git m4 scons zlib1g zlib1g-dev \ libprotobuf-dev protobuf-compiler libprotoc-dev libgoogle-perftools-dev \ python3-dev python3-six python-is-python3 doxygen libboost-all-dev \ - libhdf5-serial-dev python3-pydot libpng-dev libelf-dev + libhdf5-serial-dev python3-pydot libpng-dev libelf-dev pkg-config -- 2.30.2