Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion configs/components/libffi.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
pkg.environment 'MACOSX_DEPLOYMENT_TARGET', settings[:deployment_target]
elsif platform.is_windows?
pkg.environment 'PATH', "$(shell cygpath -u #{settings[:gcc_bindir]}):$(PATH)"
pkg.apply_patch 'resources/patches/libffi/revert_clang_32bit.patch' if platform.architecture == 'x86'
end

pkg.build_requires "runtime-#{settings[:runtime_project]}"
Expand Down
13 changes: 1 addition & 12 deletions configs/components/openssl-3.0.rb
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
pkg.environment 'CYGWIN', settings[:cygwin]
pkg.environment 'MAKE', platform[:make]

target = platform.architecture == 'x64' ? 'mingw64' : 'mingw'
target = 'mingw64'
elsif platform.is_macos?
pkg.environment 'PATH', '$(PATH):/opt/homebrew/bin:/usr/local/bin'
pkg.environment 'CC', settings[:cc]
Expand Down Expand Up @@ -111,17 +111,6 @@

build_commands = []

if platform.is_windows? && platform.architecture == 'x86'
# mingw-w32 5.2.0 has a bug in include/winnt.h that declares GetCurrentFiber
# with __CRT_INLINE, which results in the function not being inlined and
# generates a linker error: undefined reference to `GetCurrentFiber'.
# This only affects 32-bit builds
# See https://github.com/openssl/openssl/issues/513
# See https://github.com/mingw-w64/mingw-w64/commit/8da1aae7a7ff5bf996878dc8fe30a0e01e210e5a
pkg.add_source('file://resources/patches/windows/FORCEINLINE-i686-w64-mingw32-winnt.h')
build_commands << "#{platform.patch} --dir #{settings[:gcc_root]}/#{settings[:platform_triple]} --strip=2 --fuzz=0 --ignore-whitespace --no-backup-if-mismatch < ../FORCEINLINE-i686-w64-mingw32-winnt.h"
end

build_commands << "#{platform[:make]} depend"
build_commands << platform[:make]

Expand Down
23 changes: 0 additions & 23 deletions resources/patches/libffi/revert_clang_32bit.patch

This file was deleted.

12 changes: 0 additions & 12 deletions resources/patches/openssl/openssl-mingw-do-not-build-applink.patch

This file was deleted.

70 changes: 0 additions & 70 deletions resources/patches/windows/FORCEINLINE-i686-w64-mingw32-winnt.h

This file was deleted.