Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 05:30:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #24257 - servo:jdm-patch-56, r=jdm

Browse source 
Update to UWP compatible OpenSSL build.

This uses OpenSSL binaries built from https://github.com/servo/openssl-windows-build which yield no more WACK violations.

---
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix #24138
- [x] These changes do not require tests because no CI for WACK or windows yet.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/24257)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2019-10-02 16:00:40 -04:00 • committed by GitHub
commit 66035b00e3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
python/servo/build_commands.py
View file

@ -234,7 +234,7 @@ class MachCommands(CommandBase):
check_call(["rustup" + BIN_SUFFIX, "target", "add", check_call(["rustup" + BIN_SUFFIX, "target", "add",
"--toolchain", self.toolchain(), target]) "--toolchain", self.toolchain(), target])
env = self.build_env(target=target, is_build=True) env = self.build_env(target=target, is_build=True, uwp=uwp)
self.ensure_bootstrapped(target=target) self.ensure_bootstrapped(target=target)
self.ensure_clobbered() self.ensure_clobbered()

5
python/servo/command_base.py
View file

@ -614,7 +614,7 @@ install them, let us know by filing a bug!")
'vcdir': vcinstalldir, 'vcdir': vcinstalldir,
} }
def build_env(self, hosts_file_path=None, target=None, is_build=False, test_unit=False): def build_env(self, hosts_file_path=None, target=None, is_build=False, test_unit=False, uwp=False):
"""Return an extended environment dictionary.""" """Return an extended environment dictionary."""
env = os.environ.copy() env = os.environ.copy()
if sys.platform == "win32" and type(env['PATH']) == unicode: if sys.platform == "win32" and type(env['PATH']) == unicode:
@ -639,6 +639,9 @@ install them, let us know by filing a bug!")
"i686": "x86-windows", "i686": "x86-windows",
"aarch64": "arm64-windows", "aarch64": "arm64-windows",
} }
target_arch = vcpkg_arch[arch]
if uwp:
target_arch += "-uwp"
openssl_base_dir = path.join(self.msvc_package_dir("openssl"), vcpkg_arch[arch]) openssl_base_dir = path.join(self.msvc_package_dir("openssl"), vcpkg_arch[arch])
# Link openssl # Link openssl

2
python/servo/packages.py
View file

@ -8,7 +8,7 @@ WINDOWS_MSVC = {
"moztools": "3.2", "moztools": "3.2",
"ninja": "1.7.1", "ninja": "1.7.1",
"nuget": "08-08-2019", "nuget": "08-08-2019",
"openssl": "111.3.0+1.1.1c-vs2017", "openssl": "111.3.0+1.1.1c-vs2017-2019-09-18",
"gstreamer-uwp": "1.16.0.5", "gstreamer-uwp": "1.16.0.5",
"openxr-loader-uwp": "1.0", "openxr-loader-uwp": "1.0",
} }