From 0ba252f08e9ef7b62c442eb91b36822d654f5b04 Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Thu, 16 Jan 2020 17:37:48 +0100 Subject: build: install static libacl for docker builds Commit 50b0a580105ac976a1c95df9441d898d7a652bfb updated Alpine docker image, however this broke building with acl support. The static libacl moved to its own package, so just install that. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 35cbd77..fe246bb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ ENV DIR /tmp/vis WORKDIR $DIR RUN apk update && apk add musl-dev fortify-headers gcc make libtermkey-dev \ ncurses-dev ncurses-static lua5.3-dev lua5.3-lpeg lua-lpeg-dev \ - acl-dev xz-dev tar xz wget ca-certificates + acl-static acl-dev xz-dev tar xz wget ca-certificates RUN sed -i 's/Libs: /Libs: -L${INSTALL_CMOD} /' /usr/lib/pkgconfig/lua5.3.pc RUN mv /usr/lib/lua/5.3/lpeg.a /usr/lib/lua/5.3/liblpeg.a RUN sed -i 's/-ltermkey/-ltermkey -lunibilium/' /usr/lib/pkgconfig/termkey.pc -- cgit v1.2.3 From d253185a99588506f368423a3b63e0c23c0b4566 Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Thu, 16 Jan 2020 20:41:39 +0100 Subject: build: force enable acl for docker builds This makes sure the feature is enabled as expected. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 0ee47a0..5cdb53b 100644 --- a/Makefile +++ b/Makefile @@ -90,7 +90,7 @@ docker: clean docker exec vis apk upgrade docker cp . vis:/tmp/vis docker exec vis sed -i '/^VERSION/c VERSION = $(VERSION)' Makefile - docker exec vis ./configure CC='cc --static' + docker exec vis ./configure CC='cc --static' --enable-acl docker exec vis make clean vis-single docker cp vis:/tmp/vis/vis-single vis docker kill vis -- cgit v1.2.3