Skip to content

bpo-35947: Update windows to the current version of libffi #11797

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zooba merged 35 commits into from
Mar 29, 2019
Merged

bpo-35947: Update windows to the current version of libffi #11797

Changes from 1 commit
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
de396d4
Rip out libffi_msvc
zware Sep 7, 2017
e7f43ea
Remove /safeseh, which doesn't seem to exist for ml64
zware Sep 8, 2017
102a098
Fix copy of structures when passed by value.
zooba Sep 8, 2017
374110e
preserve bug fix
Jan 23, 2019
548e488
use libffi 3.3
Jan 23, 2019
bc59c71
add sysv_intel.S for x86
Feb 6, 2019
87a232f
ffi_call no longer returns stack difference from windows 32-bit
Feb 7, 2019
51ccf8a
change libffi-3.3 to libffi
Feb 11, 2019
83da944
add blurb
Feb 11, 2019
369318e
change libffi-3.3 to libffi in python.props
Feb 11, 2019
ec20baa
add configured windows header files
Feb 13, 2019
109ba99
put configured files in libffi_msvc so that they pass patchcheck.py
Feb 13, 2019
55f62c4
move configured files to ctypes-source-dep
Feb 15, 2019
c43cb08
add missing quotes
Feb 19, 2019
c663960
remove reference to libffi_msvc
Feb 19, 2019
ad7d6bf
Update PCbuild/get_externals.bat
zware Feb 19, 2019
f4ccea6
Update PCbuild/python.props
zware Feb 19, 2019
8c3479f
basic script for configuring libffi
Mar 1, 2019
d57ab4c
add cygwin info
Mar 1, 2019
0dc1bd1
add link to appveyor.yml used as a reference
Mar 1, 2019
0ba8113
used per-processor configured files
Mar 1, 2019
2f70852
remove prepare_libffi.bat
Mar 1, 2019
27b9946
generate configured header files for libffi
Mar 4, 2019
c9d8354
improvements found by trying this with ARM
Mar 5, 2019
9b4773b
use prebuilt libffi binaries
Mar 12, 2019
12e69e4
build after installing vs 2019
Mar 12, 2019
1914207
add libffi .dll to layout
Mar 12, 2019
ff0edbc
got libffi tests to run
Mar 14, 2019
9eb7c3c
setting MSBUILD is a better workaround
Mar 15, 2019
814034d
optionally install cygwin with required packages
Mar 18, 2019
d5b71ba
Fixes empty variable checks
zooba Mar 29, 2019
d7a2546
Enable overriding output directory
zooba Mar 29, 2019
ff3ff8a
Ensure VCVARSALL variable is quoted
zooba Mar 29, 2019
8fa8035
build with libffi from cpython-bin-deps
Mar 29, 2019
20d27a3
add libffi to msi definition
Mar 29, 2019
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
Prev Previous commit
Next Next commit
Fixes empty variable checks
  • Loading branch information
@zooba
zooba committed Mar 29, 2019
commit d5b71ba0f9670224b843617bc7b358ac2007d46a
18 changes: 9 additions & 9 deletions PCbuild/prepare_libffi.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,24 +44,24 @@ goto :Usage

:CheckOptsDone

if "%BUILD_X64%"=="" if "%BUILD_X86%"=="" if "%BUILD_ARM32%"=="" (
if NOT DEFINED BUILD_X64 if NOT DEFINED BUILD_X86 if NOT DEFINED BUILD_ARM32 (
set BUILD_X64=1
set BUILD_X86=1
)

if "%INSTALL_CYGWIN%"=="1" call :InstallCygwin

setlocal
if "%SH%" EQU "" if exist c:\cygwin\bin\sh.exe set SH=c:\cygwin\bin\sh.exe
if NOT DEFINED SH if exist c:\cygwin\bin\sh.exe set SH=c:\cygwin\bin\sh.exe

if (%VCVARSALL%) EQU () (
if NOT DEFINED VCVARSALL (
if exist "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" (
set VCVARSALL="C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat"
)
)

if "%LIBFFI_SOURCE%" EQU "" echo.&&echo ERROR LIBFFI_SOURCE environment variable not set && goto :Usage
if "%SH%" EQU "" echo ERROR SH environment variable not set && goto :Usage
if NOT DEFINED LIBFFI_SOURCE echo.&&echo ERROR LIBFFI_SOURCE environment variable not set && goto :Usage
if NOT DEFINED SH echo ERROR SH environment variable not set && goto :Usage

if not exist %SH% echo ERROR %SH% does not exist && goto :Usage
if not exist %LIBFFI_SOURCE% echo ERROR %LIBFFI_SOURCE% does not exist && goto :Usage
Expand Down Expand Up @@ -103,7 +103,7 @@ set HOST=%3
set ASSEMBLER=
set SRC_ARCHITECTURE=x86

if "%VCVARS_PLATFORM%" EQU "" echo ERROR bad VCVARS_PLATFORM&&exit /b 123
if NOT DEFINED VCVARS_PLATFORM echo ERROR bad VCVARS_PLATFORM&&exit /b 123

if /I "%VCVARS_PLATFORM%" EQU "x64" (
set ARCH=amd64
Expand Down Expand Up @@ -154,9 +154,9 @@ exit /b
:InstallCygwin
setlocal

if "%CYG_ROOT%"=="" (set CYG_ROOT=c:/cygwin)
if "%CYG_CACHE%"=="" (set CYG_CACHE=C:/cygwin/var/cache/setup)
if "%CYG_MIRROR%"=="" (set CYG_MIRROR=http://mirrors.kernel.org/sourceware/cygwin/)
if NOT DEFINED CYG_ROOT (set CYG_ROOT=c:/cygwin)
if NOT DEFINED CYG_CACHE (set CYG_CACHE=C:/cygwin/var/cache/setup)
if NOT DEFINED CYG_MIRROR (set CYG_MIRROR=http://mirrors.kernel.org/sourceware/cygwin/)

powershell -c "md $env:CYG_ROOT -ErrorAction SilentlyContinue"
powershell -c "$setup = $env:CYG_ROOT+'/setup.exe'; if (!(Test-Path $setup)){invoke-webrequest https://cygwin.com/setup-x86.exe -outfile $setup}
Expand Down