Skip to content
This repository was archived by the owner on Aug 30, 2025. It is now read-only.

Commit b77f99a

Browse files
Fix static libraries not showing up in Meson.
1 parent daba204 commit b77f99a

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010
- `naev-steamfrankenruntime` (Used for building linux builds in the steamruntime (scout) environment with tools and extra dependencies installed.)
1111
- `naev-windows` (Used to cross compile for Windows.)
1212

13+
### v1.7.1
14+
- Fix static libraries by installing compiled libs to the `/usr` prefix instead of `/usr/local`
15+
- This may cause issues, but we need static libraries to show up in Meson.
16+
1317
### v1.7
1418
- Add `naev-steamfrankenruntime`
1519
- This is Valve's 'scout' runtime with Python 3.6, OpenBLAS, libenet, physfs, libunibreak compiled from source, and a 'new-ish' version of git installed.

naev-steamfrankenruntime/Dockerfile.amd64

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ RUN curl -L -O https://github.com/icculus/physfs/archive/refs/tags/release-3.2.0
5656

5757
FROM registry.gitlab.steamos.cloud/steamrt/scout/sdk:latest
5858

59-
COPY --from=build /opt /usr/local
59+
COPY --from=build /opt /usr
6060

6161
LABEL org.opencontainers.image.authors "Naev Dev Team"
6262
LABEL org.opencontainers.image.source "https://github.com/naev/naev-infrastructure"
@@ -78,7 +78,7 @@ RUN echo "deb https://ppa.launchpadcontent.net/git-core/ppa/ubuntu precise main
7878
DEBIAN_FRONTEND=noninteractive apt-get install -y gfortran-4.8 libluajit-5.1-dev liblzma-dev texinfo && \
7979
apt-get clean && \
8080
# Upgrade meson via pip.
81-
update-alternatives --install /usr/local/bin/python3 python3 /usr/local/bin/python3.6 10 && \
81+
update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.6 10 && \
8282
python3 -m pip install meson --upgrade && \
8383
# Install pyyaml
8484
python3 -m pip install pyyaml && \

0 commit comments

Comments
 (0)