Skip to content

Commit

Permalink
Fix static libraries not showing up in Meson.
Browse files Browse the repository at this point in the history
  • Loading branch information
ProjectSynchro committed Apr 23, 2023
1 parent daba204 commit b77f99a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@
- `naev-steamfrankenruntime` (Used for building linux builds in the steamruntime (scout) environment with tools and extra dependencies installed.)
- `naev-windows` (Used to cross compile for Windows.)

### v1.7.1
- Fix static libraries by installing compiled libs to the `/usr` prefix instead of `/usr/local`
- This may cause issues, but we need static libraries to show up in Meson.

### v1.7
- Add `naev-steamfrankenruntime`
- 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.
Expand Down
4 changes: 2 additions & 2 deletions naev-steamfrankenruntime/Dockerfile.amd64
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ RUN curl -L -O https://github.com/icculus/physfs/archive/refs/tags/release-3.2.0

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

COPY --from=build /opt /usr/local
COPY --from=build /opt /usr

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

0 comments on commit b77f99a

Please sign in to comment.