Skip to content

Commit c00ed68

Browse files
committed
fix build and avoid #128 for now
Signed-off-by: clux <[email protected]>
1 parent 87d710e commit c00ed68

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ RUN chmod a+X /root
5353
# Convenience list of versions and variables for compilation later on
5454
# This helps continuing manually if anything breaks.
5555
ENV SSL_VER="1.1.1w" \
56-
CURL_VER="8.6.0" \
56+
CURL_VER="8.4.0" \
5757
ZLIB_VER="1.3.1" \
5858
PQ_VER="11.12" \
5959
SQLITE_VER="3450100" \
@@ -120,7 +120,7 @@ RUN curl -sSL https://ftp.postgresql.org/pub/source/v$PQ_VER/postgresql-$PQ_VER.
120120
cd .. && rm -rf postgresql-$PQ_VER
121121

122122
# Build libsqlite3 using same configuration as the alpine linux main/sqlite package
123-
RUN curl -sSL https://www.sqlite.org/2023/sqlite-autoconf-$SQLITE_VER.tar.gz | tar xz && \
123+
RUN curl -sSL https://www.sqlite.org/2024/sqlite-autoconf-$SQLITE_VER.tar.gz | tar xz && \
124124
cd sqlite-autoconf-$SQLITE_VER && \
125125
CFLAGS="-DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_SECURE_DELETE -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_ENABLE_RTREE -DSQLITE_USE_URI -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_JSON1" \
126126
CC="musl-gcc -fPIC -pie" \

justfile

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
# See https://just.systems/man/
22

3+
[private]
34
default:
4-
@just --list --unsorted --color=always | rg -v " default"
5+
@just --list --unsorted --color=always
56

67
_build channel:
78
docker build --build-arg CHANNEL="{{channel}}" -t clux/muslrust:temp .
@@ -33,7 +34,3 @@ clean-tests:
3334
sudo find . -iname Cargo.lock -exec rm {} \;
3435
sudo find . -mindepth 3 -maxdepth 3 -name target -exec rm -rf {} \;
3536
sudo rm -f test/dieselsqlitecrate/main.db
36-
37-
# mode: makefile
38-
# End:
39-
# vim: set ft=make :

0 commit comments

Comments
 (0)