Skip to content

Commit 42b8f6d

Browse files
authored
Merge pull request #190 from OpenVoxProject/windows32
Remove 32bit leftovers
2 parents 4e7a39d + ded7874 commit 42b8f6d

5 files changed

Lines changed: 1 addition & 118 deletions

File tree

configs/components/libffi.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
pkg.environment 'MACOSX_DEPLOYMENT_TARGET', settings[:deployment_target]
1414
elsif platform.is_windows?
1515
pkg.environment 'PATH', "$(shell cygpath -u #{settings[:gcc_bindir]}):$(PATH)"
16-
pkg.apply_patch 'resources/patches/libffi/revert_clang_32bit.patch' if platform.architecture == 'x86'
1716
end
1817

1918
pkg.build_requires "runtime-#{settings[:runtime_project]}"

configs/components/openssl-3.0.rb

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
pkg.environment 'CYGWIN', settings[:cygwin]
2929
pkg.environment 'MAKE', platform[:make]
3030

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

112112
build_commands = []
113113

114-
if platform.is_windows? && platform.architecture == 'x86'
115-
# mingw-w32 5.2.0 has a bug in include/winnt.h that declares GetCurrentFiber
116-
# with __CRT_INLINE, which results in the function not being inlined and
117-
# generates a linker error: undefined reference to `GetCurrentFiber'.
118-
# This only affects 32-bit builds
119-
# See https://github.com/openssl/openssl/issues/513
120-
# See https://github.com/mingw-w64/mingw-w64/commit/8da1aae7a7ff5bf996878dc8fe30a0e01e210e5a
121-
pkg.add_source('file://resources/patches/windows/FORCEINLINE-i686-w64-mingw32-winnt.h')
122-
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"
123-
end
124-
125114
build_commands << "#{platform[:make]} depend"
126115
build_commands << platform[:make]
127116

resources/patches/libffi/revert_clang_32bit.patch

Lines changed: 0 additions & 23 deletions
This file was deleted.

resources/patches/openssl/openssl-mingw-do-not-build-applink.patch

Lines changed: 0 additions & 12 deletions
This file was deleted.

resources/patches/windows/FORCEINLINE-i686-w64-mingw32-winnt.h

Lines changed: 0 additions & 70 deletions
This file was deleted.

0 commit comments

Comments
 (0)