vis

commit 13bd15cbd1cd5a98fb384fb85eccc7f0ff0eceec
parent ca72db61a26758eb3d8e5253c7d6e8049371b0a8
Author: Marc André Tanner <mat@brain-dump.org>
Date:   Fri, 17 Jan 2020 07:08:15 +0100

Merge branch 'acl-static' of https://github.com/eworm-de/vis

Diffstat:
M
Dockerfile
 | 
2
+-
M
Makefile
 | 
2
+-

2 files changed, 2 insertions(+), 2 deletions(-)
diff --git 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
diff --git 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