diff options
| -rw-r--r-- | ciimage/Dockerfile | 11 | ||||
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/ciimage/Dockerfile b/ciimage/Dockerfile new file mode 100644 index 0000000..35997f8 --- /dev/null +++ b/ciimage/Dockerfile @@ -0,0 +1,11 @@ +FROM ubuntu:zesty + +RUN apt-get -y update && apt-get -y upgrade \ +&& apt-get -y install git wget unzip \ +&& apt-get -y build-dep meson \ +&& apt-get -y install qt5-default itstool clang libgtk-3-dev \ +&& apt-get -y install pkg-config-arm-linux-gnueabihf g++-6-arm-linux-gnueabihf \ +&& apt-get -y install valgrind doxygen \ +&& apt-get -y install llvm libsdl2-dev \ +&& apt-get -y install python3-pip libxml2-dev libxslt1-dev cmake libyaml-dev \ +&& python3 -m pip install hotdoc codecov diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 3b2a941..d169c84 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -995,7 +995,7 @@ int dummy; the build directory. """ result = OrderedSet() - for dep in target.link_targets: + for dep in target.link_targets + target.link_whole_targets: for i in dep.sources: if hasattr(i, 'fname'): i = i.fname |