rb_sys 0.9.44 → 0.9.46
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- checksums.yaml.gz.sig +0 -0
- data/lib/rb_sys/mkmf/config.rb +2 -1
- data/lib/rb_sys/mkmf.rb +10 -4
- data/lib/rb_sys/version.rb +1 -1
- data.tar.gz.sig +0 -0
- metadata +2 -2
- metadata.gz.sig +0 -0
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: f77f084cfb03e13eb0357b3e63b0d8d516ff8e1fac6acf9c6bb98072668ca730
|
4
|
+
data.tar.gz: c3db1bd7e0886b182555ec81a539e6f91a5beaf172efb588b6efffd2733ad27b
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: f54a91c1e95826f61c1df74e5c971e8a41e9fa07a74759f1fb6e8ce854ec174e8097e178198a3d8319e0e192229fab54090ad20e1d1940b9fb9d92675a8ac6cf
|
7
|
+
data.tar.gz: 1926663702290069dec03533acb610090fac519c37c086e6ff3f52c0a8e70e9be21a960c3ce17e8ad81a2dccf7a90709dde6093e4cf642255c8aed03bee6d2d1
|
checksums.yaml.gz.sig
CHANGED
Binary file
|
data/lib/rb_sys/mkmf/config.rb
CHANGED
@@ -4,13 +4,14 @@ module RbSys
|
|
4
4
|
module Mkmf
|
5
5
|
# Config that delegates to CargoBuilder if needded
|
6
6
|
class Config
|
7
|
-
attr_accessor :force_install_rust_toolchain, :clean_after_install, :target_dir, :auto_install_rust_toolchain
|
7
|
+
attr_accessor :force_install_rust_toolchain, :clean_after_install, :target_dir, :auto_install_rust_toolchain, :rubygems_clean_dirs
|
8
8
|
|
9
9
|
def initialize(builder)
|
10
10
|
@builder = builder
|
11
11
|
@force_install_rust_toolchain = false
|
12
12
|
@auto_install_rust_toolchain = true
|
13
13
|
@clean_after_install = rubygems_invoked?
|
14
|
+
@rubygems_clean_dirs = ["./cargo-vendor"]
|
14
15
|
end
|
15
16
|
|
16
17
|
def cross_compiling?
|
data/lib/rb_sys/mkmf.rb
CHANGED
@@ -103,6 +103,7 @@ module RbSys
|
|
103
103
|
CLEANOBJS = $(RUSTLIBDIR) $(RB_SYS_BUILD_DIR)
|
104
104
|
DEFFILE = $(RB_SYS_CARGO_TARGET_DIR)/$(TARGET)-$(arch).def
|
105
105
|
CLEANLIBS = $(DLLIB) $(RUSTLIB) $(DEFFILE)
|
106
|
+
RUBYGEMS_CLEAN_DIRS = $(CLEANOBJS) $(CLEANFILES) #{builder.rubygems_clean_dirs.join(" ")}
|
106
107
|
|
107
108
|
#{base_makefile(srcdir)}
|
108
109
|
|
@@ -134,7 +135,8 @@ module RbSys
|
|
134
135
|
\t$(INSTALL_PROG) $(DLLIB) $(RUBYARCHDIR)
|
135
136
|
|
136
137
|
gemclean:
|
137
|
-
\t
|
138
|
+
\t$(ECHO) Cleaning gem artifacts
|
139
|
+
\t-$(Q)$(RM_RF) $(RUBYGEMS_CLEAN_DIRS) 2> /dev/null || true
|
138
140
|
|
139
141
|
install: #{builder.clean_after_install ? "install-so gemclean" : "install-so"}
|
140
142
|
|
@@ -166,9 +168,9 @@ module RbSys
|
|
166
168
|
|
167
169
|
def env_vars(builder)
|
168
170
|
lines = builder.build_env.map { |k, v| env_line(k, v) }
|
169
|
-
lines << env_line("CC", env_or_makefile_config("CC"))
|
170
|
-
lines << env_line("CXX", env_or_makefile_config("CXX"))
|
171
|
-
lines << env_line("AR", env_or_makefile_config("AR")) unless env_or_makefile_config("AR") == "libtool -static"
|
171
|
+
lines << env_line("CC", strip_cmd(env_or_makefile_config("CC")))
|
172
|
+
lines << env_line("CXX", strip_cmd(env_or_makefile_config("CXX")))
|
173
|
+
lines << env_line("AR", strip_cmd(env_or_makefile_config("AR"))) unless env_or_makefile_config("AR") == "libtool -static"
|
172
174
|
lines.compact.join("\n")
|
173
175
|
end
|
174
176
|
|
@@ -177,6 +179,10 @@ module RbSys
|
|
177
179
|
export_env(k, v.gsub("\n", '\n'))
|
178
180
|
end
|
179
181
|
|
182
|
+
def strip_cmd(cmd)
|
183
|
+
cmd.gsub("-nologo", "").strip
|
184
|
+
end
|
185
|
+
|
180
186
|
def env_or_makefile_config(key)
|
181
187
|
ENV[key] || RbConfig::MAKEFILE_CONFIG[key]
|
182
188
|
end
|
data/lib/rb_sys/version.rb
CHANGED
data.tar.gz.sig
CHANGED
Binary file
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: rb_sys
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.9.
|
4
|
+
version: 0.9.46
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Ian Ker-Seymer
|
@@ -30,7 +30,7 @@ cert_chain:
|
|
30
30
|
Rl+ASkq2/1i07TkBpCf+2hq66+h/hx+/Y/KrUzXfe0jtvil0WESkJT2kqRqHWNhD
|
31
31
|
9GKBxaQlXokNDtWCm1/gl6cD8WRZ0N5S4ZGJT1FLLsA=
|
32
32
|
-----END CERTIFICATE-----
|
33
|
-
date: 2022-
|
33
|
+
date: 2022-12-05 00:00:00.000000000 Z
|
34
34
|
dependencies: []
|
35
35
|
description:
|
36
36
|
email:
|
metadata.gz.sig
CHANGED
Binary file
|