diff --git a/ports/boost-build/0002-fix-get-version.patch b/ports/boost-build/0002-fix-get-version.patch new file mode 100644 index 0000000000..cf35e7831c --- /dev/null +++ b/ports/boost-build/0002-fix-get-version.patch @@ -0,0 +1,13 @@ +diff --git a/src/tools/clang-linux.jam b/src/tools/clang-linux.jam +index 949e277..8934787 100644 +--- a/src/tools/clang-linux.jam ++++ b/src/tools/clang-linux.jam +@@ -97,7 +97,7 @@ rule init ( version ? : command * : options * ) { + + rule get-full-version ( command-string ) + { +- return [ common.match-command-output version : "version ([0-9.]+)" ++ return [ common.match-command-output version : "([0-9]+.[0-9]+.[0-9]+)" + : "$(command-string) --version" ] ; + } + diff --git a/ports/boost-build/portfile.cmake b/ports/boost-build/portfile.cmake index 2f3bc7a080..ec913ceaf7 100644 --- a/ports/boost-build/portfile.cmake +++ b/ports/boost-build/portfile.cmake @@ -12,7 +12,9 @@ vcpkg_from_github( REF boost-${BOOST_VERSION} SHA512 867966e3d254c0e996786587fb64ad1bda6f96546e5302c15231b17d66537798770bbd9e89f800d445a1f0a4d3be06dff8aed42dfd3a77b563d0f5d715e79324 HEAD_REF master - PATCHES 0001-don-t-skip-install-targets.patch + PATCHES + 0001-don-t-skip-install-targets.patch + 0002-fix-get-version.patch ) vcpkg_download_distfile(ARCHIVE diff --git a/ports/boost-build/vcpkg.json b/ports/boost-build/vcpkg.json index 6cb3ff14aa..a425121de4 100644 --- a/ports/boost-build/vcpkg.json +++ b/ports/boost-build/vcpkg.json @@ -1,6 +1,7 @@ { "name": "boost-build", "version": "1.78.0", + "port-version": 1, "description": "Boost.Build", "homepage": "https://github.com/boostorg/build", "dependencies": [ diff --git a/versions/b-/boost-build.json b/versions/b-/boost-build.json index 533afa4158..140b50fd32 100644 --- a/versions/b-/boost-build.json +++ b/versions/b-/boost-build.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cf970c17a4bf6d59deff7ce7e7eb98cec74b544a", + "version": "1.78.0", + "port-version": 1 + }, { "git-tree": "2c0d3c35e95f99911a226c3e736c0988f1139e51", "version": "1.78.0", diff --git a/versions/baseline.json b/versions/baseline.json index 532e0c926e..010de5a168 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -570,7 +570,7 @@ }, "boost-build": { "baseline": "1.78.0", - "port-version": 0 + "port-version": 1 }, "boost-callable-traits": { "baseline": "1.78.0",