File tree Expand file tree Collapse file tree 4 files changed +14
-11
lines changed Expand file tree Collapse file tree 4 files changed +14
-11
lines changed Original file line number Diff line number Diff line change 1
1
FROM debian:11 AS debian
2
2
3
3
RUN apt-get update \
4
- && apt-get install -y build-essential libevent-dev libpcre3 -dev automake libtool pkg-config git curl llvm-13 clang-13 \
4
+ && apt-get install -y build-essential libevent-dev libpcre2 -dev automake libtool pkg-config git curl llvm-13 clang-13 \
5
5
&& (pkg-config || true)
6
6
7
7
ARG release
@@ -25,7 +25,7 @@ RUN apk add --no-cache \
25
25
# Statically-compiled llvm
26
26
llvm13-dev llvm13-static \
27
27
# Static stdlib dependencies
28
- zlib-static yaml-static libxml2-dev pcre -dev libevent-static \
28
+ zlib-static yaml-static libxml2-dev pcre2 -dev libevent-static \
29
29
# Static compiler dependencies
30
30
libffi-dev \
31
31
# Build tools
Original file line number Diff line number Diff line change 13
13
source git : CRYSTAL_SRC
14
14
end
15
15
16
- dependency "pcre "
16
+ dependency "pcre2 "
17
17
dependency "bdw-gc"
18
18
dependency "llvm_bin" unless FIRST_RUN
19
19
dependency "libevent"
75
75
76
76
make "crystal stats=true release=true target=aarch64-apple-darwin FLAGS=\" #{ crflags } \" CRYSTAL_CONFIG_TARGET=aarch64-apple-darwin CRYSTAL_CONFIG_LIBRARY_PATH= O=#{ output_path } " , env : env
77
77
78
- command "clang #{ output_path } /crystal.o -o #{ output_bin } _arm64 -target arm64-apple-darwin src/llvm/ext/llvm_ext.o `llvm-config --libs --system-libs --ldflags 2>/dev/null` -lstdc++ -lpcre -lgc -lpthread -levent -liconv -ldl -v" , env : env
78
+ command "clang #{ output_path } /crystal.o -o #{ output_bin } _arm64 -target arm64-apple-darwin src/llvm/ext/llvm_ext.o `llvm-config --libs --system-libs --ldflags 2>/dev/null` -lstdc++ -lpcre2-8 -lgc -lpthread -levent -liconv -ldl -v" , env : env
79
79
delete "#{ output_path } /crystal.o"
80
80
81
81
# Lipo them up
Original file line number Diff line number Diff line change 14
14
# limitations under the License.
15
15
#
16
16
17
- name "pcre "
18
- default_version "8.40 "
17
+ name "pcre2 "
18
+ default_version "10.42 "
19
19
skip_transitive_dependency_licensing true
20
20
21
- source url : "https://ftp.exim.org/pub/pcre/pcre -#{ version } .tar.gz" ,
22
- md5 : "890c808122bd90f398e6bc40ec862102 "
21
+ source url : "https://github.com/PCRE2Project/pcre2/releases/download/pcre2- #{ version } /pcre2 -#{ version } .tar.gz" ,
22
+ md5 : "37d2f77cfd411a3ddf1c64e1d72e43f7 "
23
23
24
- relative_path "pcre -#{ version } "
24
+ relative_path "pcre2 -#{ version } "
25
25
26
26
build do
27
27
env = with_standard_compiler_flags ( with_embedded_path )
30
30
31
31
command "./configure" \
32
32
" --prefix=#{ install_dir } /embedded" \
33
+ " --disable-cpp" \
33
34
" --disable-shared" \
34
35
" --enable-unicode-properties" \
35
- " --enable-utf8" , env : env
36
+ " --enable-utf" , env : env
37
+ # TODO: Enable JIT (Error: "Must target Big Sur or newer")
38
+ # " --enable-jit" \
36
39
37
40
make "-j #{ workers } " , env : env
38
41
make "install" , env : env
Original file line number Diff line number Diff line change 86
86
# Build for ARM64
87
87
crflags += " --cross-compile --target aarch64-apple-darwin"
88
88
make "bin/shards SHARDS=false CRYSTAL=#{ install_dir } /bin/crystal FLAGS='#{ crflags } '" , env : env
89
- command "clang bin/shards.o -o bin/shards_arm64 -target arm64-apple-darwin -L#{ install_dir } /embedded/lib -lyaml -lpcre -lgc -lpthread -levent -liconv -ldl" , env : env
89
+ command "clang bin/shards.o -o bin/shards_arm64 -target arm64-apple-darwin -L#{ install_dir } /embedded/lib -lyaml -lpcre2-8 -lgc -lpthread -levent -liconv -ldl" , env : env
90
90
91
91
# Lipo them up
92
92
command "lipo -create -output bin/shards bin/shards_x86_64 bin/shards_arm64"
You can’t perform that action at this time.
0 commit comments