-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
pcre2 has been the default for a long time now
- Loading branch information
1 parent
7caa059
commit 46aa4ea
Showing
6 changed files
with
17 additions
and
17 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -30,14 +30,14 @@ RUN git clone --depth=1 --single-branch --branch=$crystal_version https://github | |
gzip -9 man/crystal.1 && \ | ||
mkdir .build && \ | ||
make crystal interpreter=1 release=1 target=$TARGETARCH-unknown-linux-gnu \ | ||
PREFIX=/usr FLAGS="--no-debug -Duse_pcre2" CRYSTAL_CONFIG_LIBRARY_PATH=/usr/lib64/crystal | tail -1 > .build/crystal.sh && \ | ||
PREFIX=/usr FLAGS="--no-debug" CRYSTAL_CONFIG_LIBRARY_PATH=/usr/lib64/crystal | tail -1 > .build/crystal.sh && \ | ||
rm src/llvm/ext/llvm_ext.o | ||
# Build shards | ||
WORKDIR /tmp/shards | ||
ARG shards_version=0.17.2 | ||
RUN git clone --depth=1 --single-branch --branch=v${shards_version} https://github.com/crystal-lang/shards.git . && \ | ||
gzip -9 man/shards.1 man/shard.yml.5 && \ | ||
make bin/shards FLAGS="--release --no-debug --cross-compile --target=$TARGETARCH-unknown-linux-gnu -Duse_pcre2" | tail -1 > bin/shards.sh | ||
make bin/shards FLAGS="--release --no-debug --cross-compile --target=$TARGETARCH-unknown-linux-gnu" | tail -1 > bin/shards.sh | ||
|
||
# link on target platform | ||
FROM $base_image:$base_image_tag AS target-builder | ||
|
@@ -90,7 +90,7 @@ RUN fpm -s dir -t rpm -n crystal -v $(sed 's/-/~/' pkg/usr/share/crystal/src/VER | |
--url https://crystal-lang.org --maintainer "84codes <[email protected]>" \ | ||
--description "a general-purpose, object-oriented programming language" \ | ||
--depends gcc --depends pkgconfig --depends libevent-devel \ | ||
--depends pcre-devel --depends pcre2-devel \ | ||
--depends pcre2-devel \ | ||
--depends gmp-devel --depends openssl-devel --depends libxml2-devel \ | ||
--depends libyaml-devel --depends zlib-devel \ | ||
--depends llvm${llvm_version}-libs --depends libffi \ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -49,7 +49,7 @@ RUN fpm -s dir -t deb -n crystal -v $(cat pkg/usr/share/crystal/src/VERSION) --i | |
--url https://crystal-lang.org --maintainer "84codes <[email protected]>" \ | ||
--description "a general-purpose, object-oriented programming language" \ | ||
--depends gcc --depends pkg-config --depends libevent-dev \ | ||
--depends libpcre2-dev --depends libpcre3-dev \ | ||
--depends libpcre2-dev \ | ||
--depends libz-dev \ | ||
--deb-recommends libssl-dev --deb-recommends libxml2-dev \ | ||
--deb-recommends libgmp-dev --deb-recommends libyaml-dev \ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -26,15 +26,15 @@ ARG crystal_version | |
RUN git clone --depth=1 --single-branch --branch=$crystal_version https://github.com/crystal-lang/crystal.git . && \ | ||
gzip -9 man/crystal.1 && \ | ||
mkdir .build && \ | ||
make crystal interpreter=1 release=1 target=$TARGETARCH-unknown-linux-gnu PREFIX=/usr FLAGS="--no-debug -Duse_pcre2" \ | ||
make crystal interpreter=1 release=1 target=$TARGETARCH-unknown-linux-gnu PREFIX=/usr FLAGS="--no-debug" \ | ||
CRYSTAL_CONFIG_LIBRARY_PATH=/usr/lib/crystal | tail -1 > .build/crystal.sh && \ | ||
rm src/llvm/ext/llvm_ext.o | ||
# Build shards | ||
WORKDIR /tmp/shards | ||
ARG shards_version=0.17.3 | ||
RUN git clone --depth=1 --single-branch --branch=v${shards_version} https://github.com/crystal-lang/shards.git . && \ | ||
gzip -9 man/shards.1 man/shard.yml.5 && \ | ||
make bin/shards FLAGS="--release --no-debug --cross-compile --target=$TARGETARCH-unknown-linux-gnu -Duse_pcre2" | tail -1 > bin/shards.sh | ||
make bin/shards FLAGS="--release --no-debug --cross-compile --target=$TARGETARCH-unknown-linux-gnu" | tail -1 > bin/shards.sh | ||
|
||
# link on target platform | ||
FROM $base_image:$codename AS target-builder | ||
|
@@ -89,7 +89,7 @@ RUN fpm -s dir -t deb -n crystal -v $(cat pkg/usr/share/crystal/src/VERSION) --i | |
--url https://crystal-lang.org --maintainer "84codes <[email protected]>" \ | ||
--description "a general-purpose, object-oriented programming language" \ | ||
--depends gcc --depends pkg-config --depends libevent-dev \ | ||
--depends libpcre2-dev --depends libpcre3-dev \ | ||
--depends libpcre2-dev \ | ||
--depends llvm-$llvm_version --depends libz-dev --depends libffi-dev \ | ||
--deb-recommends libssl-dev --deb-recommends libxml2-dev \ | ||
--deb-recommends libgmp-dev --deb-recommends libyaml-dev \ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -29,15 +29,15 @@ ARG crystal_version | |
RUN git clone --depth=1 --single-branch --branch=$crystal_version https://github.com/crystal-lang/crystal.git . && \ | ||
gzip -9 man/crystal.1 && \ | ||
mkdir .build && \ | ||
make crystal interpreter=1 release=1 target=$TARGETARCH-unknown-linux-gnu \ | ||
PREFIX=/usr FLAGS="--no-debug -Duse_pcre2" CRYSTAL_CONFIG_LIBRARY_PATH=/usr/lib64/crystal | tail -1 > .build/crystal.sh && \ | ||
make crystal interpreter=1 target=$TARGETARCH-unknown-linux-gnu \ | ||
PREFIX=/usr FLAGS="--no-debug" CRYSTAL_CONFIG_LIBRARY_PATH=/usr/lib64/crystal | tail -1 > .build/crystal.sh && \ | ||
rm src/llvm/ext/llvm_ext.o | ||
# Build shards | ||
WORKDIR /usr/src/shards | ||
ARG shards_version=0.17.2 | ||
RUN git clone --depth=1 --single-branch --branch=v${shards_version} https://github.com/crystal-lang/shards.git . && \ | ||
gzip -9 man/shards.1 man/shard.yml.5 && \ | ||
make bin/shards FLAGS="--release --no-debug --cross-compile --target=$TARGETARCH-unknown-linux-gnu -Duse_pcre2" | tail -1 > bin/shards.sh | ||
make bin/shards FLAGS="--no-debug --cross-compile --target=$TARGETARCH-unknown-linux-gnu" | tail -1 > bin/shards.sh | ||
|
||
# link on target platform | ||
FROM $base_image:$base_image_tag AS target-builder | ||
|
@@ -90,7 +90,7 @@ RUN fpm -s dir -t rpm -n crystal -v $(sed 's/-/~/' pkg/usr/share/crystal/src/VER | |
--url https://crystal-lang.org --maintainer "84codes <[email protected]>" \ | ||
--description "a general-purpose, object-oriented programming language" \ | ||
--depends gcc --depends pkgconfig --depends libevent-devel \ | ||
--depends pcre-devel --depends pcre2-devel \ | ||
--depends pcre2-devel \ | ||
--depends gmp-devel --depends openssl-devel --depends libxml2-devel \ | ||
--depends libyaml-devel --depends zlib-devel \ | ||
--depends llvm${llvm_version}-libs --depends libffi \ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -31,14 +31,14 @@ ARG pkg_revision=1 | |
RUN fpm -s dir -t deb -n crystal -v ${crystal_version} --iteration ${pkg_revision} -a native \ | ||
--url https://crystal-lang.org --maintainer "84codes <[email protected]>" \ | ||
--description "a general-purpose, object-oriented programming language" \ | ||
--depends gcc --depends libpcre2-dev --depends libpcre3-dev --depends pkg-config --depends libevent-dev \ | ||
--depends gcc --depends libpcre2-dev --depends pkg-config --depends libevent-dev \ | ||
--deb-recommends libssl-dev --deb-recommends libz-dev --deb-recommends libxml2-dev \ | ||
--deb-recommends libgmp-dev --deb-recommends libyaml-dev --deb-recommends git \ | ||
--license "Apache 2.0" --chdir pkg . | ||
RUN fpm -s dir -t rpm -n crystal -v ${crystal_version} --iteration ${pkg_revision} -a native \ | ||
--url https://crystal-lang.org --maintainer "84codes <[email protected]>" \ | ||
--description "a general-purpose, object-oriented programming language" \ | ||
--depends gcc --depends pcre-devel --depends pcre2-devel --depends pkgconfig --depends libevent-devel \ | ||
--depends gcc --depends pcre2-devel --depends pkgconfig --depends libevent-devel \ | ||
--depends gmp-devel --depends openssl-devel --depends libxml2-devel \ | ||
--depends libyaml-devel --depends zlib-devel \ | ||
--license "ASL 2.0" --chdir pkg . | ||
|