From 0d78f8a965e2be06282498f3bd104400732c6f2a Mon Sep 17 00:00:00 2001 From: Shahzad Malik Muzaffar Date: Thu, 10 Feb 2022 09:33:53 +0100 Subject: [PATCH 1/2] backport boost 1.78 changes from devel branch --- boost.spec | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/boost.spec b/boost.spec index cb87d19d023..dc1b58997ad 100644 --- a/boost.spec +++ b/boost.spec @@ -1,15 +1,13 @@ -### RPM external boost 1.75.0 +### RPM external boost 1.78.0 ## INCLUDE compilation_flags -%define tag 3defebd61ecb0970c0046c85384bb34ec9572ac3 +%define tag 7f597ea02d8a714076157b4bf65fa8e5752b8468 %define branch cms/v%realversion %define github_user cms-externals Source: git+https://github.com/%github_user/%n.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}.tgz -Patch0: boost-1.75.0-disable-statx Requires: python3 bz2lib zlib openmpi xz zstd %prep %setup -n %{n}-%{realversion} -%patch0 -p1 %build case %cmsos in @@ -36,6 +34,7 @@ echo "using python : ${PYTHONV3} : ${PYTHON3_ROOT}/bin/python3 : ${PYTHON3_ROOT} b2 -q \ -d2 \ + define=BOOST_FILESYSTEM_DISABLE_STATX \ %{makeprocesses} \ --build-dir=build-boost \ --disable-icu \ From 5bdfcea62538ec3a0fd4c3d4c38d8cf5232162bd Mon Sep 17 00:00:00 2001 From: Shahzad Malik Muzaffar Date: Thu, 10 Feb 2022 09:34:24 +0100 Subject: [PATCH 2/2] deleted unused boost patch --- boost-1.75.0-disable-statx.patch | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 boost-1.75.0-disable-statx.patch diff --git a/boost-1.75.0-disable-statx.patch b/boost-1.75.0-disable-statx.patch deleted file mode 100644 index 395c0a2c22d..00000000000 --- a/boost-1.75.0-disable-statx.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/libs/filesystem/build/Jamfile.v2 b/libs/filesystem/build/Jamfile.v2 -index 132641a..0f2c2c8 100644 ---- a/libs/filesystem/build/Jamfile.v2 -+++ b/libs/filesystem/build/Jamfile.v2 -@@ -53,8 +53,6 @@ project boost/filesystem - [ check-target-builds ../config//has_stat_st_birthtim "has stat::st_birthtim" : BOOST_FILESYSTEM_HAS_STAT_ST_BIRTHTIM ] - [ check-target-builds ../config//has_stat_st_birthtimensec "has stat::st_birthtimensec" : BOOST_FILESYSTEM_HAS_STAT_ST_BIRTHTIMENSEC ] - [ check-target-builds ../config//has_stat_st_birthtimespec "has stat::st_birthtimespec" : BOOST_FILESYSTEM_HAS_STAT_ST_BIRTHTIMESPEC ] -- [ check-target-builds ../config//has_statx "has statx" : BOOST_FILESYSTEM_HAS_STATX ] -- [ check-target-builds ../config//has_statx_syscall "has statx syscall" : BOOST_FILESYSTEM_HAS_STATX_SYSCALL ] - @select-windows-crypto-api - : source-location ../src - : usage-requirements # pass these requirement to dependents (i.e. users)