iv-org
/
invidious
mirror of https://github.com/iv-org/invidious.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Crystal: Force using PCRE (legacy) for cross-compilation 

PCRE2 support was added in Crystal v1.7.0, and used by default
in Crystal v1.8.0.

As we don't want to have to guess what version of the PCRE was
used on the build host, force the use of the legacy version until
we drop support for older versions of Crystal.
This commit is contained in:
Samantaz Fox 2023-09-17 13:39:48 +02:00
parent b154819a81
commit ad9ba381e3
No known key found for this signature in database
GPG Key ID: F42821059186176E
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@ -77,25 +77,25 @@ run: invidious
# - armhf (arm-linux-gnueabihf) # - armhf (arm-linux-gnueabihf)
invidious-cross-amd64-glibc: invidious-cross-amd64-glibc:
crystal build src/invidious.cr $(FLAGS) -Dskip_videojs_download \ crystal build src/invidious.cr $(FLAGS) -Duse_pcre -Dskip_videojs_download \
--cross-compile --target='x86_64-linux-gnu' -o invidious-amd64-glibc --cross-compile --target='x86_64-linux-gnu' -o invidious-amd64-glibc
invidious-cross-amd64-musl: invidious-cross-amd64-musl:
crystal build src/invidious.cr $(FLAGS) -Dskip_videojs_download \ crystal build src/invidious.cr $(FLAGS) -Duse_pcre -Dskip_videojs_download \
--cross-compile --target='x86_64-linux-musl' -o invidious-amd64-musl --cross-compile --target='x86_64-linux-musl' -o invidious-amd64-musl
invidious-cross-arm64-glibc: invidious-cross-arm64-glibc:
crystal build src/invidious.cr $(FLAGS) -Dskip_videojs_download \ crystal build src/invidious.cr $(FLAGS) -Duse_pcre -Dskip_videojs_download \
--cross-compile --target='aarch64-linux-gnu' -o invidious-arm64-glibc --cross-compile --target='aarch64-linux-gnu' -o invidious-arm64-glibc
invidious-cross-arm64-musl: invidious-cross-arm64-musl:
crystal build src/invidious.cr $(FLAGS) -Dskip_videojs_download \ crystal build src/invidious.cr $(FLAGS) -Duse_pcre -Dskip_videojs_download \
--cross-compile --target='aarch64-linux-musl' -o invidious-arm64-musl --cross-compile --target='aarch64-linux-musl' -o invidious-arm64-musl
invidious-cross-armhf: invidious-cross-armhf:
crystal build src/invidious.cr $(FLAGS) -Dskip_videojs_download \ crystal build src/invidious.cr $(FLAGS) -Duse_pcre -Dskip_videojs_download \
--cross-compile --target='arm-linux-gnueabihf' -o invidious-armhf --cross-compile --target='arm-linux-gnueabihf' -o invidious-armhf

2
docker/Dockerfile.arm64-musl-cross
View File

@ -1,7 +1,7 @@
FROM alpine:3.18 AS builder FROM alpine:3.18 AS builder
RUN apk add --no-cache gcc make yaml-static libxml2-static sqlite-static zlib-static \ RUN apk add --no-cache gcc make yaml-static libxml2-static sqlite-static zlib-static \
xz-static openssl-libs-static openssl-dev pcre-dev gc-dev libevent-static musl-dev xz-static openssl-libs-static openssl-dev pcre-dev pcre2-dev gc-dev libevent-static musl-dev
ARG release ARG release