diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2020-02-04 15:50:10 -0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2020-02-04 15:50:10 -0800 |
| commit | 6f66ad14fe9da11d4bf50f5b25b4da86ed971c53 (patch) | |
| tree | 0f5dbcd1719cd6a8e486c4058cfefd607d58aa6c /ports/boost-build | |
| parent | d502f061bb3ee0258d6453acbf258b9e5d93d564 (diff) | |
| parent | d808514c9df44bb97d6eccff952bfe8ec4e156f7 (diff) | |
| download | vcpkg-6f66ad14fe9da11d4bf50f5b25b4da86ed971c53.tar.gz vcpkg-6f66ad14fe9da11d4bf50f5b25b4da86ed971c53.zip | |
Merge remote-tracking branch 'origin/master' into HEAD
Diffstat (limited to 'ports/boost-build')
| -rw-r--r-- | ports/boost-build/CONTROL | 2 | ||||
| -rw-r--r-- | ports/boost-build/arm64msvc.patch | 63 | ||||
| -rw-r--r-- | ports/boost-build/portfile.cmake | 7 |
3 files changed, 3 insertions, 69 deletions
diff --git a/ports/boost-build/CONTROL b/ports/boost-build/CONTROL index ce5473df5..4ccff7bc8 100644 --- a/ports/boost-build/CONTROL +++ b/ports/boost-build/CONTROL @@ -1,4 +1,4 @@ Source: boost-build
-Version: 1.70.0-1
+Version: 1.72.0
Homepage: https://github.com/boostorg/build
Description: Boost.Build
diff --git a/ports/boost-build/arm64msvc.patch b/ports/boost-build/arm64msvc.patch deleted file mode 100644 index 47f30acfb..000000000 --- a/ports/boost-build/arm64msvc.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff --git a/src/tools/msvc.jam b/src/tools/msvc.jam
-index e6c0b60..62c3a41 100644
---- a/src/tools/msvc.jam
-+++ b/src/tools/msvc.jam
-@@ -466,6 +466,7 @@ rule configure-version-specific ( toolset : version : conditions )
- toolset.flags $(toolset).link LINKFLAGS $(conditions)/$(.cpu-arch-i386) : "/MACHINE:X86" ;
- toolset.flags $(toolset).link LINKFLAGS $(conditions)/$(.cpu-arch-ia64) : "/MACHINE:IA64" ;
- toolset.flags $(toolset).link LINKFLAGS $(conditions)/$(.cpu-arch-arm) : "/MACHINE:ARM" ;
-+ toolset.flags $(toolset).link LINKFLAGS $(conditions)/$(.cpu-arch-arm64) : "/MACHINE:ARM64" ;
-
- # Make sure that manifest will be generated even if there is no
- # dependencies to put there.
-@@ -1256,7 +1257,7 @@ local rule configure-really ( version ? : options * )
- local below-8.0 = [ MATCH "^([67]\\.)" : $(version) ] ;
- local below-11.0 = [ MATCH "^([6789]\\.|10\\.)" : $(version) ] ;
-
-- local cpu = i386 amd64 ia64 arm ;
-+ local cpu = i386 amd64 ia64 arm arm64 ;
- if $(below-8.0)
- {
- cpu = i386 ;
-@@ -1270,6 +1271,7 @@ local rule configure-really ( version ? : options * )
- local setup-i386 ;
- local setup-ia64 ;
- local setup-arm ;
-+ local setup-arm64 ;
- local setup-phone-i386 ;
- local setup-phone-arm ;
-
-@@ -1327,6 +1329,7 @@ local rule configure-really ( version ? : options * )
- local default-setup-i386 = vcvars32.bat ;
- local default-setup-ia64 = vcvarsx86_ia64.bat ;
- local default-setup-arm = vcvarsx86_arm.bat ;
-+ local default-setup-arm64 = vcvarsx86_arm64.bat ;
- local default-setup-phone-i386 = vcvarsphonex86.bat ;
- local default-setup-phone-arm = vcvarsphonex86_arm.bat ;
-
-@@ -1338,6 +1341,7 @@ local rule configure-really ( version ? : options * )
- local default-global-setup-options-i386 = x86 ;
- local default-global-setup-options-ia64 = x86_ia64 ;
- local default-global-setup-options-arm = x86_arm ;
-+ local default-global-setup-options-arm64 = x86_arm64 ;
-
- # When using 64-bit Windows, and targeting 64-bit, it is possible to
- # use a native 64-bit compiler, selected by the "amd64" & "ia64"
-@@ -1418,6 +1422,7 @@ local rule configure-really ( version ? : options * )
- local default-assembler-i386 = "ml -coff" ;
- local default-assembler-ia64 = ias ;
- local default-assembler-ia64 = armasm ;
-+ local default-assembler-arm64 = armasm64 ;
-
- assembler = [ feature.get-values <assembler> : $(options) ] ;
-
-@@ -1932,6 +1937,9 @@ if [ MATCH (--debug-configuration) : [ modules.peek : ARGV ] ]
- <architecture>arm/<address-model>
- <architecture>arm/<address-model>32 ;
-
-+.cpu-arch-arm64 =
-+ <architecture>arm/<address-model>
-+ <architecture>arm/<address-model>64 ;
-
- # Supported CPU types (only Itanium optimization options are supported from
- # VC++ 2005 on). See
diff --git a/ports/boost-build/portfile.cmake b/ports/boost-build/portfile.cmake index 77da81057..be076d422 100644 --- a/ports/boost-build/portfile.cmake +++ b/ports/boost-build/portfile.cmake @@ -8,17 +8,14 @@ elseif(CMAKE_HOST_WIN32 AND VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_N return()
endif()
-set(BOOST_VERSION 1.70.0)
+set(BOOST_VERSION 1.72.0)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/build
REF boost-${BOOST_VERSION}
- SHA512 be4e410a9656313519e089977a24da8f633db2182985f5d60e07e489f9eac8c887e8cab7e3cbd13f2b747bc3d9dab2899f174be1eaac73cfd7895015fb6b9b58
+ SHA512 744816ba805013a49029373a4d2aa5b5f543275a1cdef2812c2120c868c55bf36a0bb0fb891cd955ad7319e582fd5212bd52ff071703a8654b345c478e810a19
HEAD_REF master
- PATCHES
- # Add the support of arm64-windows
- arm64msvc.patch
)
vcpkg_download_distfile(ARCHIVE
|