diff options
| author | huangqinjin <huangqinjin@gmail.com> | 2021-05-01 02:43:39 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-30 11:43:39 -0700 |
| commit | 8badb231a4491a9bfb0450340d56fe010158f6f5 (patch) | |
| tree | f01480c49589b7be85271b58b9096d2ed6676179 /ports/boost-build | |
| parent | b7057d1ade3fcd57f6d0f177b88501ba895f7800 (diff) | |
| download | vcpkg-8badb231a4491a9bfb0450340d56fe010158f6f5.tar.gz vcpkg-8badb231a4491a9bfb0450340d56fe010158f6f5.zip | |
[boost-context] support android (#16930)
Diffstat (limited to 'ports/boost-build')
| -rw-r--r-- | ports/boost-build/portfile.cmake | 11 | ||||
| -rw-r--r-- | ports/boost-build/vcpkg.json | 3 |
2 files changed, 9 insertions, 5 deletions
diff --git a/ports/boost-build/portfile.cmake b/ports/boost-build/portfile.cmake index 791e15a1c..9bee6a0b0 100644 --- a/ports/boost-build/portfile.cmake +++ b/ports/boost-build/portfile.cmake @@ -4,13 +4,13 @@ if(CMAKE_HOST_WIN32 AND VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME return()
endif()
-set(BOOST_VERSION 1.75.0.beta1)
+set(BOOST_VERSION 1.75.0)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/build
REF boost-${BOOST_VERSION}
- SHA512 e5dd73ef41d341e2bce25677389502d22ca7f328e7fdbb91d95aac415f7b490008d75ff0a63f8e4bd9427215f863c161ec9573c29b663b727df4b60e25a3aac2
+ SHA512 dc5784cdcc908591a8c8814dac32849fb00b5f5b2d48de963d51a0571fd9f5a0419d6bb569f3375bf8fbfae28d680db4ce869604667b717023e76869836534f4
HEAD_REF master
PATCHES
fix_options.patch
@@ -28,8 +28,13 @@ vcpkg_download_distfile(BOOSTCPP_ARCHIVE SHA512 8cf929fa4a602342c859a6bbd5f9dda783ac29431d951bcf6cae4cb14377c1b3aed90bacd902b0f7d1807591cf5e1a244cf8fc3c6cc6e0a4056db145b58f51df
)
+# https://github.com/boostorg/boost/pull/206
+# do not add version suffix for android
+file(READ "${BOOSTCPP_ARCHIVE}" _contents)
+string(REPLACE "aix &&" "aix android &&" _contents "${_contents}")
+file(WRITE "${SOURCE_PATH}/boostcpp.jam" "${_contents}")
+
file(INSTALL ${ARCHIVE} DESTINATION ${CURRENT_PACKAGES_DIR}/share/boost-build RENAME copyright)
-file(INSTALL ${BOOSTCPP_ARCHIVE} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/boost-build RENAME boostcpp.jam)
# This fixes the lib path to use desktop libs instead of uwp -- TODO: improve this with better "host" compilation
string(REPLACE "\\store\\;" "\\;" LIB "$ENV{LIB}")
diff --git a/ports/boost-build/vcpkg.json b/ports/boost-build/vcpkg.json index ede342956..0abab074f 100644 --- a/ports/boost-build/vcpkg.json +++ b/ports/boost-build/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boost-build", - "version-string": "1.75.0.beta1", - "port-version": 1, + "version-string": "1.75.0", "description": "Boost.Build", "homepage": "https://github.com/boostorg/build", "dependencies": [ |