From 8b1686210c4c432c973c31d01348670052023222 Mon Sep 17 00:00:00 2001 From: Leonid Pliushch Date: Mon, 13 Jan 2020 01:13:45 +0200 Subject: [PATCH] boost: fix patch --- .../tools-build-src-tools-common.jam.patch | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/packages/boost/tools-build-src-tools-common.jam.patch b/packages/boost/tools-build-src-tools-common.jam.patch index d52ad0f46..9bc001a52 100644 --- a/packages/boost/tools-build-src-tools-common.jam.patch +++ b/packages/boost/tools-build-src-tools-common.jam.patch @@ -1,19 +1,16 @@ -diff -u -r ../boost_1_70_0/tools/build/src/tools/common.jam ./tools/build/src/tools/common.jam ---- ../boost_1_70_0/tools/build/src/tools/common.jam 2019-04-09 19:36:57.000000000 +0000 -+++ ./tools/build/src/tools/common.jam 2019-05-05 22:41:59.313215785 +0000 -@@ -980,10 +980,11 @@ +diff -uNr boost_1_72_0/tools/build/src/tools/common.jam boost_1_72_0.mod/tools/build/src/tools/common.jam +--- boost_1_72_0/tools/build/src/tools/common.jam 2019-12-10 02:20:17.000000000 +0200 ++++ boost_1_72_0.mod/tools/build/src/tools/common.jam 2020-01-13 01:11:52.367381897 +0200 +@@ -979,12 +979,6 @@ + version = $(version[1]) ; } - # Ditto, from Clang 4 -- if ( $(tag) = clang || $(tag) = clangw ) && [ numbers.less 3 $(version[1]) ] +- # Ditto, from Clang 4 +- if ( $(tag) = clang || $(tag) = clangw ) && $(version[1]) && [ numbers.less 3 $(version[1]) ] - { - version = $(version[1]) ; - } -+ # See https://github.com/boostorg/build/issues/385 -+ #if ( $(tag) = clang || $(tag) = clangw ) && [ numbers.less 3 $(version[1]) ] -+ #{ -+ # version = $(version[1]) ; -+ #} - +- # On intel, version is not added, because it does not matter and it is the # version of vc used as backend that matters. Ideally, we should encode the + # backend version but that would break compatibility with V1.