tebako 0.15.4 → 0.15.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/tebako/packager/pass1_patch.rb +4 -1
- data/lib/tebako/packager/pass2msys_patch.rb +4 -1
- data/lib/tebako/packager/patch.rb +12 -0
- data/lib/tebako/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 870838f8bc3e816c81e57029f0723175ec84c10ab8f06310ba7ede8b1c45ab37
|
|
4
|
+
data.tar.gz: d0d1a2740cb0400a4e1c62696758fbb9a0abbe20c622a3ed8135c78308471e5c
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 3a5faf5d50ac825a8103f2ebdc6118f49e2bdbf8637b2aeecee26e3780dcddc1d71937d01c1ce8269f8a03c25b19d2b5b888c5bd2c2f1480647103e69ecb3860
|
|
7
|
+
data.tar.gz: e9fccfd4b1573b2542f5ffcdac8fc19f7ab753ecdf7542bcb6199c364ea67c36b706560f8d00a6f7cf3036e65f0ceeaf3cb0067e21880b85fd5cd9807f3d516f
|
|
@@ -265,7 +265,10 @@ module Tebako
|
|
|
265
265
|
# ....................................................
|
|
266
266
|
# Rename ruby's clock_gettime/clock_getres fallbacks before the
|
|
267
267
|
# toolchain build (winpthreads static-inline collision)
|
|
268
|
-
"win32/win32.c" => WIN32_WIN32_C_CLOCK_PATCH
|
|
268
|
+
"win32/win32.c" => WIN32_WIN32_C_CLOCK_PATCH,
|
|
269
|
+
# ....................................................
|
|
270
|
+
# Group-wrap the static-ext ruby.exe link libraries
|
|
271
|
+
"common.mk" => COMMON_MK_STATIC_RUBY_LINK_PATCH
|
|
269
272
|
}
|
|
270
273
|
end
|
|
271
274
|
|
|
@@ -185,7 +185,10 @@ module Tebako
|
|
|
185
185
|
"cygwin/GNUmakefile.in" => gnumakefile_in_patch_p2,
|
|
186
186
|
"ruby.c" => RUBY_C_MSYS_PATCHES,
|
|
187
187
|
"win32/file.c" => WIN32_FILE_C_MSYS_PATCHES,
|
|
188
|
-
"win32/win32.c" => WIN32_WIN32_C_MSYS_PATCHES
|
|
188
|
+
"win32/win32.c" => WIN32_WIN32_C_MSYS_PATCHES,
|
|
189
|
+
# Group-wrap the static-ext ruby.exe link libraries for the final
|
|
190
|
+
# build (same common.mk STATIC_RUBY rule as the toolchain build)
|
|
191
|
+
"common.mk" => COMMON_MK_STATIC_RUBY_LINK_PATCH
|
|
189
192
|
}
|
|
190
193
|
end
|
|
191
194
|
end
|
|
@@ -44,6 +44,18 @@ module Tebako
|
|
|
44
44
|
# End of tebako patch
|
|
45
45
|
SUBST
|
|
46
46
|
|
|
47
|
+
# The static-ext ruby.exe link (common.mk STATIC_RUBY rule, identical in
|
|
48
|
+
# ruby 3.1-4.0) puts the vcpkg static OpenSSL ahead of the Windows system
|
|
49
|
+
# libs it references (Cert* from crypt32, WspiapiGet* from ws2_32); GNU
|
|
50
|
+
# ld's single pass then leaves them unresolved (tebako#345). Group-wrap
|
|
51
|
+
# the libs so resolution is order-insensitive. Shared across Pass1
|
|
52
|
+
# (toolchain build) and Pass2 (final build, re-patched from pristine).
|
|
53
|
+
COMMON_MK_STATIC_RUBY_LINK_PATCH = {
|
|
54
|
+
"$(MAINOBJ) $(DLDOBJS) $(LIBRUBY_A) $(MAINLIBS) $(EXTLIBS) $(LIBS) $(OUTFLAG)$@" =>
|
|
55
|
+
"$(MAINOBJ) $(DLDOBJS) $(LIBRUBY_A) -Wl,--start-group $(MAINLIBS) $(EXTLIBS) $(LIBS) " \
|
|
56
|
+
"-Wl,--end-group $(OUTFLAG)$@ # tebako patched"
|
|
57
|
+
}.freeze
|
|
58
|
+
|
|
47
59
|
# Ruby patching definitions (common base)
|
|
48
60
|
class Patch
|
|
49
61
|
def patch_map
|
data/lib/tebako/version.rb
CHANGED