summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Yavorska <jyavorska@protonmail.com>2020-05-13 15:19:18 +0200
committerSimon Steinbeiß <ochosi@xfce.org>2020-05-13 15:19:18 +0200
commitf9318560bf6d89eeab71cb58a6a99c3a4a1c0741 (patch)
treeded260d44ba146051f62d4b5f6a4582e8f631bd6
parentaebc3366f56d4bad6e96b929021a4f79c986351a (diff)
downloadxfce4-dev-tools-f9318560bf6d89eeab71cb58a6a99c3a4a1c0741.tar.gz
Remove automake workaround
-rw-r--r--Dockerfile5
1 files changed, 0 insertions, 5 deletions
diff --git a/Dockerfile b/Dockerfile
index 4f0ebc0..5d47d30 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,13 +9,8 @@ RUN sed -Ei 's/^# deb-src /deb-src /' /etc/apt/sources.list
# Set up dependencies
RUN apt-get update
RUN apt-get -y --no-install-recommends install libglib2.0-dev git libtool m4 automake intltool libx11-dev libgtk-3-dev libxfce4util-dev libxfce4ui-2-dev libwnck-3-dev libexo-2-dev gobject-introspection libgirepository1.0-dev \
- && apt-get -y --no-install-recommends install automake-1.15 make \
&& apt-get -y --no-install-recommends build-dep xfce4-panel thunar xfce4-settings xfce4-session xfdesktop4 xfwm4 xfce4-appfinder tumbler xfce4-terminal xfce4-clipman-plugin xfce4-screenshooter
-# Remove automake 1.16 to avoid `config.status: error: Something went wrong bootstrapping makefile fragments`.
-# If this is removed we should also remove the explicit install of automake-1.15 above.
-RUN apt-get remove -y automake
-
# Build and install the latest tag for all Xfce core libraries
RUN mkdir /git
COPY ci/build_libs.sh /git/build_libs.sh