diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2020-10-07 12:48:38 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2020-10-08 12:19:39 -0700 |
| commit | 21f1cf09f7de90080951dfb96d5ef638865624dc (patch) | |
| tree | 0fec6bf3e838e6c000f2e227433992acf08c39f7 | |
| parent | b29140f6e816f7a4faf4d57ac2a1d9b96be269d6 (diff) | |
| download | subsurface-21f1cf09f7de90080951dfb96d5ef638865624dc.tar.gz | |
build-system: remove Grantlee from the container setup scripts
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | scripts/docker/mxe-build-container/settings-stage2.mk | 1 | ||||
| -rw-r--r-- | scripts/docker/trusty-qt512/Dockerfile | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/scripts/docker/mxe-build-container/settings-stage2.mk b/scripts/docker/mxe-build-container/settings-stage2.mk index f06b5a94a..3d3ad3cc3 100644 --- a/scripts/docker/mxe-build-container/settings-stage2.mk +++ b/scripts/docker/mxe-build-container/settings-stage2.mk @@ -10,7 +10,6 @@ MXE_TARGETS := i686-w64-mingw32.shared # The three lines below makes `make` build these "local packages" instead of all packages. LOCAL_PKG_LIST := curl \ - grantlee \ hidapi \ libftdi1 \ libgit2 \ diff --git a/scripts/docker/trusty-qt512/Dockerfile b/scripts/docker/trusty-qt512/Dockerfile index 1e21076c1..383d6725c 100644 --- a/scripts/docker/trusty-qt512/Dockerfile +++ b/scripts/docker/trusty-qt512/Dockerfile @@ -73,9 +73,9 @@ RUN cd /openssl-OpenSSL_1_1_1 && \ RUN apt-get remove -y libqt5core5a libqt5dbus5 libqt5gui5 ruby openssh-client # now build Subsurface once to populate the dependencies we don't get from -# Ubuntu but that aren't really part of Subsurface (libgit, grantlee, googlemaps) +# Ubuntu but that aren't really part of Subsurface (libgit, googlemaps) RUN git clone git://github.com/Subsurface/subsurface RUN bash -e -x ./subsurface/scripts/build.sh -desktop -create-appdir -build-with-webkit # remove the source, but keep the install-root -RUN rm -rf subsurface libgit2 googlemaps grantlee +RUN rm -rf subsurface libgit2 googlemaps |