aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc André Tanner <mat@brain-dump.org>2020-01-17 07:08:15 +0100
committerMarc André Tanner <mat@brain-dump.org>2020-01-17 07:08:15 +0100
commitbd4130068fef76fe152289b7babe5589cd1443ff (patch)
tree1a60d8e1aca52a08401f6533f12f2761fdcca130
parentc4afcd18a4b64507934bb4cc6ea9f65302eda2ea (diff)
parentd253185a99588506f368423a3b63e0c23c0b4566 (diff)
downloadvis-bd4130068fef76fe152289b7babe5589cd1443ff.tar.gz
vis-bd4130068fef76fe152289b7babe5589cd1443ff.tar.xz
Merge branch 'acl-static' of https://github.com/eworm-de/vis
-rw-r--r--Dockerfile2
-rw-r--r--Makefile2
2 files changed, 2 insertions, 2 deletions
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
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