mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

build-system: remove Grantlee from the container setup scripts

Browse source 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2020-10-07 12:48:38 -07:00
parent b29140f6e8
commit 21f1cf09f7
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
scripts/docker/mxe-build-container/settings-stage2.mk
View file

@ -10,7 +10,6 @@ MXE_TARGETS := i686-w64-mingw32.shared
# The three lines below makes `make` build these "local packages" instead of all packages. # The three lines below makes `make` build these "local packages" instead of all packages.
LOCAL_PKG_LIST := curl \ LOCAL_PKG_LIST := curl \
grantlee \
hidapi \ hidapi \
libftdi1 \ libftdi1 \
libgit2 \ libgit2 \

4
scripts/docker/trusty-qt512/Dockerfile
View file

@ -73,9 +73,9 @@ RUN cd /openssl-OpenSSL_1_1_1 && \
RUN apt-get remove -y libqt5core5a libqt5dbus5 libqt5gui5 ruby openssh-client RUN apt-get remove -y libqt5core5a libqt5dbus5 libqt5gui5 ruby openssh-client
# now build Subsurface once to populate the dependencies we don't get from # 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 git clone git://github.com/Subsurface/subsurface
RUN bash -e -x ./subsurface/scripts/build.sh -desktop -create-appdir -build-with-webkit RUN bash -e -x ./subsurface/scripts/build.sh -desktop -create-appdir -build-with-webkit
# remove the source, but keep the install-root # remove the source, but keep the install-root
RUN rm -rf subsurface libgit2 googlemaps grantlee RUN rm -rf subsurface libgit2 googlemaps