From 8f89f6b1f207630d421eb9bed946a6622dee34d8 Mon Sep 17 00:00:00 2001 From: tobtoht Date: Mon, 12 Feb 2024 19:31:49 +0100 Subject: [PATCH] depends: boost: update to 1.84.0 --- contrib/depends/packages/boost.mk | 18 +++++------- .../depends/patches/boost/fix_arm_arch.patch | 11 -------- .../depends/patches/boost/fix_aroptions.patch | 28 ------------------- .../depends/patches/boost/fix_coalesce.patch | 22 --------------- 4 files changed, 7 insertions(+), 72 deletions(-) delete mode 100644 contrib/depends/patches/boost/fix_arm_arch.patch delete mode 100644 contrib/depends/patches/boost/fix_aroptions.patch delete mode 100644 contrib/depends/patches/boost/fix_coalesce.patch diff --git a/contrib/depends/packages/boost.mk b/contrib/depends/packages/boost.mk index 3f7fba1f167..27c1c854cbd 100644 --- a/contrib/depends/packages/boost.mk +++ b/contrib/depends/packages/boost.mk @@ -1,18 +1,17 @@ package=boost -$(package)_version=1_64_0 -$(package)_download_path=https://downloads.sourceforge.net/project/boost/boost/1.64.0/ -$(package)_file_name=$(package)_$($(package)_version).tar.bz2 -$(package)_sha256_hash=7bcc5caace97baa948931d712ea5f37038dbb1c5d89b43ad4def4ed7cb683332 -$(package)_patches=fix_aroptions.patch fix_arm_arch.patch fix_coalesce.patch +$(package)_version=1.84.0 +$(package)_download_path=https://archives.boost.io/release/$($(package)_version)/source/ +$(package)_file_name=$(package)_$(subst .,_,$($(package)_version)).tar.bz2 +$(package)_sha256_hash=cc4b893acf645c9d4b698e9a0f08ca8846aa5d6c68275c14c3e7949c24109454 define $(package)_set_vars $(package)_config_opts_release=variant=release $(package)_config_opts_debug=variant=debug -$(package)_config_opts=--layout=tagged --build-type=complete --user-config=user-config.jam +$(package)_config_opts+=--layout=system --user-config=user-config.jam $(package)_config_opts+=threading=multi link=static -sNO_BZIP2=1 -sNO_ZLIB=1 $(package)_config_opts_linux=threadapi=pthread runtime-link=shared $(package)_config_opts_android=threadapi=pthread runtime-link=static target-os=android -$(package)_config_opts_darwin=--toolset=darwin runtime-link=shared +$(package)_config_opts_darwin=--toolset=darwin runtime-link=shared target-os=darwin $(package)_config_opts_mingw32=binary-format=pe target-os=windows threadapi=win32 runtime-link=static $(package)_config_opts_x86_64_mingw32=address-model=64 $(package)_config_opts_i686_mingw32=address-model=32 @@ -23,16 +22,13 @@ $(package)_toolset_darwin=darwin $(package)_archiver_darwin=$($(package)_libtool) $(package)_config_libraries_$(host_os)="chrono,filesystem,program_options,system,thread,test,date_time,regex,serialization" $(package)_config_libraries_mingw32="chrono,filesystem,program_options,system,thread,test,date_time,regex,serialization,locale" -$(package)_cxxflags+=-std=c++11 +$(package)_cxxflags=-std=c++17 $(package)_cxxflags_linux+=-fPIC $(package)_cxxflags_freebsd+=-fPIC $(package)_cxxflags_darwin+=-ffile-prefix-map=$($(package)_extract_dir)=/usr endef define $(package)_preprocess_cmds - patch -p1 < $($(package)_patch_dir)/fix_aroptions.patch &&\ - patch -p1 < $($(package)_patch_dir)/fix_arm_arch.patch &&\ - patch -p1 < $($(package)_patch_dir)/fix_coalesce.patch &&\ echo "using $(boost_toolset_$(host_os)) : : $($(package)_cxx) : \"$($(package)_cxxflags) $($(package)_cppflags)\" \"$($(package)_ldflags)\" \"$(boost_archiver_$(host_os))\" \"$($(package)_arflags)\" \"$(host_STRIP)\" \"$(host_RANLIB)\" \"$(host_WINDRES)\" : ;" > user-config.jam endef diff --git a/contrib/depends/patches/boost/fix_arm_arch.patch b/contrib/depends/patches/boost/fix_arm_arch.patch deleted file mode 100644 index 3cf6b6f4ecf..00000000000 --- a/contrib/depends/patches/boost/fix_arm_arch.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- boost_1_64_0/tools/build/src/tools/darwin.jam.O 2017-04-17 03:22:26.000000000 +0100 -+++ boost_1_64_0/tools/build/src/tools/darwin.jam 2022-05-04 17:26:29.984464447 +0000 -@@ -505,7 +505,7 @@ - if $(instruction-set) { - options = -arch$(_)$(instruction-set) ; - } else { -- options = -arch arm ; -+# options = -arch arm ; - } - } - } diff --git a/contrib/depends/patches/boost/fix_aroptions.patch b/contrib/depends/patches/boost/fix_aroptions.patch deleted file mode 100644 index 5b2ec100617..00000000000 --- a/contrib/depends/patches/boost/fix_aroptions.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- boost_1_64_0/tools/build/src/tools/gcc.jam.O 2017-04-17 03:22:26.000000000 +0100 -+++ boost_1_64_0/tools/build/src/tools/gcc.jam 2019-11-15 15:46:16.957937137 +0000 -@@ -243,6 +243,8 @@ - { - ECHO notice: using gcc archiver :: $(condition) :: $(archiver[1]) ; - } -+ local arflags = [ feature.get-values : $(options) ] ; -+ toolset.flags gcc.archive .ARFLAGS $(condition) : $(arflags) ; - - # - Ranlib. - local ranlib = [ common.get-invocation-command gcc -@@ -970,6 +972,7 @@ - # logic in intel-linux, but that is hardly worth the trouble as on Linux, 'ar' - # is always available. - .AR = ar ; -+.ARFLAGS = rc ; - .RANLIB = ranlib ; - - toolset.flags gcc.archive AROPTIONS ; -@@ -1011,7 +1014,7 @@ - # - actions piecemeal archive - { -- "$(.AR)" $(AROPTIONS) rc "$(<)" "$(>)" -+ "$(.AR)" $(AROPTIONS) $(.ARFLAGS) "$(<)" "$(>)" - "$(.RANLIB)" "$(<)" - } - diff --git a/contrib/depends/patches/boost/fix_coalesce.patch b/contrib/depends/patches/boost/fix_coalesce.patch deleted file mode 100644 index c00aed3722b..00000000000 --- a/contrib/depends/patches/boost/fix_coalesce.patch +++ /dev/null @@ -1,22 +0,0 @@ -Boost 1.64.0 doesn't recognize that we're building with Clang and passes a -flags that results in an error. We don't support GCC < 4.0 at all, so -commenting out the lines here is fine. Patch can be dropped when we update to -Boost 1.84.0 - ---- boost_1_64_0/tools/build/src/tools/darwin.jam -+++ boost_1_64_0/tools/build/src/tools/darwin.jam -@@ -138,10 +138,10 @@ rule init ( version ? : command * : options * : requirement * ) - common.handle-options darwin : $(condition) : $(command) : $(options) ; - - # - GCC 4.0 and higher in Darwin does not have -fcoalesce-templates. -- if $(real-version) < "4.0.0" -- { -- flags darwin.compile.c++ OPTIONS $(condition) : -fcoalesce-templates ; -- } -+ #if $(real-version) < "4.0.0" -+ #{ -+ # flags darwin.compile.c++ OPTIONS $(condition) : -fcoalesce-templates ; -+ #} - # - GCC 4.2 and higher in Darwin does not have -Wno-long-double. - if $(real-version) < "4.2.0" - {