File tree 6 files changed +14
-8
lines changed
build/patches2/rake-compiler-1.2.5
6 files changed +14
-8
lines changed Original file line number Diff line number Diff line change 49
49
alias : aarch64-linux
50
50
- platform : arm-linux-gnu
51
51
alias : arm-linux
52
+ - platform : arm-linux-musl
52
53
- platform : arm64-darwin
53
54
- platform : jruby
54
55
- platform : x64-mingw-ucrt
Original file line number Diff line number Diff line change 2
2
/.yardoc
3
3
/Dockerfile.mri.aarch64-linux-gnu
4
4
/Dockerfile.mri.arm-linux-gnu
5
+ /Dockerfile.mri.arm-linux-musl
5
6
/Dockerfile.mri.arm64-darwin
6
7
/Dockerfile.mri.x64-mingw-ucrt
7
8
/Dockerfile.mri.x64-mingw32
Original file line number Diff line number Diff line change @@ -148,11 +148,9 @@ else
148
148
]
149
149
end
150
150
151
- xrubies_build_plan . each do |xrubies , bootstrap_ruby_version | %>
152
- ENV XRUBIES <%= xrubies %>
151
+ strip = '-s' if platform !~ /darwin/
153
152
154
- <% strip = '-s' if platform !~ /darwin/ %>
155
- # Build xruby versions, then cleanup all build artifacts
153
+ xrubies_build_plan . each do |xrubies , bootstrap_ruby_version | %>
156
154
RUN bash -c " \
157
155
rbenv shell <%= bootstrap_ruby_version %> && \
158
156
export CPPFLAGS='<%= "-D__USE_MINGW_ANSI_STDIO=1" if platform =~ /x64-mingw-ucrt/ %> ' && \
@@ -161,7 +159,7 @@ RUN bash -c " \
161
159
<%= "export LIBS='-l:libssp.a' &&" if platform =~ /mingw/ %> \
162
160
<%= "export CC=#{ target } -clang &&" if platform =~ /darwin/ %> \
163
161
export MAKE='make V=1' && \
164
- rake-compiler cross-ruby VERSION=$XRUBIES HOST=<%= target %> && \
162
+ rake-compiler cross-ruby VERSION=<%= xrubies %> HOST=<%= target %> && \
165
163
rm -rf ~/.rake-compiler/builds ~/.rake-compiler/sources \
166
164
"
167
165
<% end %>
Original file line number Diff line number Diff line change @@ -12,6 +12,7 @@ platforms = [
12
12
# tuple is [platform, target]
13
13
[ "aarch64-linux-gnu" , "aarch64-linux-gnu" ] ,
14
14
[ "arm-linux-gnu" , "arm-linux-gnueabihf" ] ,
15
+ [ "arm-linux-musl" , "arm-linux-musleabihf" ] ,
15
16
[ "arm64-darwin" , "aarch64-apple-darwin" ] ,
16
17
[ "x64-mingw-ucrt" , "x86_64-w64-mingw32" ] ,
17
18
[ "x64-mingw32" , "x86_64-w64-mingw32" ] ,
Original file line number Diff line number Diff line change @@ -2,7 +2,7 @@ diff --git a/tasks/bin/cross-ruby.rake b/tasks/bin/cross-ruby.rake
2
2
index 8317a2a..5a1b3ea 100644
3
3
--- a/tasks/bin/cross-ruby.rake
4
4
+++ b/tasks/bin/cross-ruby.rake
5
- @@ -116,10 +116,22 @@ RUBY_CC_VERSIONS.split(":").each do |ruby_cc_version|
5
+ @@ -116,10 +116,26 @@ RUBY_CC_VERSIONS.split(":").each do |ruby_cc_version|
6
6
"--host=#{mingw_host}",
7
7
"--target=#{mingw_target}",
8
8
"--build=#{RUBY_BUILD}",
@@ -12,7 +12,8 @@ index 8317a2a..5a1b3ea 100644
12
12
'--disable-install-doc',
13
13
'--with-ext=',
14
14
]
15
- + if mingw_host=~/darwin/
15
+
16
+ + if mingw_host =~ /darwin/
16
17
+ options += [
17
18
+ '--enable-static',
18
19
+ '--disable-shared',
@@ -23,6 +24,9 @@ index 8317a2a..5a1b3ea 100644
23
24
+ '--enable-shared',
24
25
+ ]
25
26
+ end
26
-
27
+ +
28
+ + # https://github.com/docker-library/ruby/issues/308
29
+ + options << "--with-coroutine=arm32" if major == "2.7" && mingw_target =~ /arm-linux-musl/
30
+ +
27
31
# Force Winsock2 for Ruby 1.8, 1.9 defaults to it
28
32
options << "--with-winsock2" if major == "1.8"
Original file line number Diff line number Diff line change 23
23
aarch64-linux-gnu
24
24
arm-linux
25
25
arm-linux-gnu
26
+ arm-linux-musl
26
27
arm64-darwin
27
28
x64-mingw-ucrt
28
29
x64-mingw32
You can’t perform that action at this time.
0 commit comments