Skip to content

Commit b45630d

Browse files
authored
Merge pull request #6 from cyberplant/compile_luajit
2 parents f1e0193 + 47bf7e3 commit b45630d

File tree

3 files changed

+13
-4
lines changed

3 files changed

+13
-4
lines changed

Dockerfile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ RUN \
2525
curl-dev \
2626
doxygen \
2727
gettext-dev \
28+
git \
2829
gmp-dev \
2930
hiredis-dev \
3031
icu-dev \
@@ -36,7 +37,6 @@ RUN \
3637
libtool \
3738
libvorbis-dev \
3839
libxi-dev \
39-
luajit-dev \
4040
mesa-dev \
4141
ncurses-dev \
4242
ninja-build \
@@ -56,13 +56,17 @@ RUN \
5656
libintl \
5757
libpq \
5858
libstdc++ \
59-
luajit \
6059
lua-socket \
6160
sdl2 \
6261
sqlite \
6362
sqlite-libs \
6463
zstd \
6564
zstd-libs && \
65+
echo "**** compile latest luajit ****" && \
66+
git clone https://luajit.org/git/luajit.git && \
67+
cd luajit && \
68+
make amalg PREFIX=/usr && \
69+
make install PREFIX=/usr && \
6670
echo "**** compile prometheus-cpp ****" && \
6771
mkdir -p /tmp/prometheus-cpp && \
6872
PROM_URL=$(curl -sX GET "https://api.github.com/repos/jupp0r/prometheus-cpp/releases/latest" \

Dockerfile.aarch64

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ RUN \
2525
curl-dev \
2626
doxygen \
2727
gettext-dev \
28+
git \
2829
gmp-dev \
2930
hiredis-dev \
3031
icu-dev \
@@ -36,7 +37,6 @@ RUN \
3637
libtool \
3738
libvorbis-dev \
3839
libxi-dev \
39-
luajit-dev \
4040
mesa-dev \
4141
ncurses-dev \
4242
ninja-build \
@@ -56,13 +56,17 @@ RUN \
5656
libintl \
5757
libpq \
5858
libstdc++ \
59-
luajit \
6059
lua-socket \
6160
sdl2 \
6261
sqlite \
6362
sqlite-libs \
6463
zstd \
6564
zstd-libs && \
65+
echo "**** compile latest luajit ****" && \
66+
git clone https://luajit.org/git/luajit.git && \
67+
cd luajit && \
68+
make amalg PREFIX=/usr && \
69+
make install PREFIX=/usr && \
6670
echo "**** compile prometheus-cpp ****" && \
6771
mkdir -p /tmp/prometheus-cpp && \
6872
PROM_URL=$(curl -sX GET "https://api.github.com/repos/jupp0r/prometheus-cpp/releases/latest" \

readme-vars.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,5 +82,6 @@ init_diagram: |
8282
"luanti:latest" <- Base Images
8383
# changelog
8484
changelogs:
85+
- {date: "03.11.25:", desc: "Use latest LuaJIT from git to fix math bugs"}
8586
- {date: "09.07.25:", desc: "Rebase to Alpine 3.22."}
8687
- {date: "30.01.25:", desc: "Initial Release."}

0 commit comments

Comments
 (0)