diff --git a/0001-boost-1.81.0-build-optflags.patch b/0001-boost-1.83.0-build-optflags.patch similarity index 73% rename from 0001-boost-1.81.0-build-optflags.patch rename to 0001-boost-1.83.0-build-optflags.patch index f83729f275fec25bd9da4fb5ee350532961a536c..9e80b5af515905f33907130ede2ce1ca1ea91637 100644 --- a/0001-boost-1.81.0-build-optflags.patch +++ b/0001-boost-1.83.0-build-optflags.patch @@ -1,26 +1,26 @@ diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam index d2e608a22..8920e96ba 100644 ---- a/tools/build/src/tools/gcc.jam -+++ b/tools/build/src/tools/gcc.jam -@@ -511,7 +511,7 @@ rule compile.fortran ( targets * : sources * : properties * ) +--- a/tools/build/src/tools/gcc.jam 2023-11-12 15:25:27.494508595 +0800 ++++ b/tools/build/src/tools/gcc.jam 2023-11-12 15:26:51.428447580 +0800 +@@ -513,7 +513,7 @@ actions compile.c++ bind PCH_FILE { -- "$(CONFIG_COMMAND)" $(LANG) -ftemplate-depth-$(TEMPLATE_DEPTH) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -include"$(PCH_FILE:S=)" -I"$(INCLUDES)" -include"$(FORCE_INCLUDES)" -c -o "$(<:W)" "$(>:W)" -+ "$(CONFIG_COMMAND)" $(LANG) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -include"$(PCH_FILE:S=)" -I"$(INCLUDES)" -include"$(FORCE_INCLUDES)" -c -o "$(<:W)" "$(>:W)" +- "$(CONFIG_COMMAND)" $(LANG) -ftemplate-depth-$(TEMPLATE_DEPTH) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) $(INCLUDE-GCH)$(_)"$(PCH_FILE:S=)" $(INCLUDE-PCH)$(_)"$(PCH_FILE)" -I"$(INCLUDES)" -include$(_)"$(FORCE_INCLUDES)" -c -o "$(<)" "$(>:T)" ++ "$(CONFIG_COMMAND)" $(LANG) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) $(INCLUDE-GCH)$(_)"$(PCH_FILE:S=)" $(INCLUDE-PCH)$(_)"$(PCH_FILE)" -I"$(INCLUDES)" -include$(_)"$(FORCE_INCLUDES)" -c -o "$(<)" "$(>:T)" } actions compile.c bind PCH_FILE -@@ -521,7 +521,7 @@ actions compile.c bind PCH_FILE +@@ -523,7 +523,7 @@ actions compile.c++.preprocess bind PCH_FILE { -- "$(CONFIG_COMMAND)" $(LANG) -ftemplate-depth-$(TEMPLATE_DEPTH) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -include"$(PCH_FILE:S=)" -I"$(INCLUDES)" -include"$(FORCE_INCLUDES)" "$(>:W)" -E >"$(<:W)" -+ "$(CONFIG_COMMAND)" $(LANG) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -include"$(PCH_FILE:S=)" -I"$(INCLUDES)" -include"$(FORCE_INCLUDES)" "$(>:W)" -E >"$(<:W)" +- "$(CONFIG_COMMAND)" $(LANG) -ftemplate-depth-$(TEMPLATE_DEPTH) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) $(INCLUDE-GCH)$(_)"$(PCH_FILE:S=)" $(INCLUDE-PCH)$(_)"$(PCH_FILE)" -I"$(INCLUDES)" -include$(_)"$(FORCE_INCLUDES)" "$(>:T)" -E >"$(<)" ++ "$(CONFIG_COMMAND)" $(LANG) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) $(INCLUDE-GCH)$(_)"$(PCH_FILE:S=)" $(INCLUDE-PCH)$(_)"$(PCH_FILE)" -I"$(INCLUDES)" -include$(_)"$(FORCE_INCLUDES)" "$(>:T)" -E >"$(<)" } actions compile.c.preprocess bind PCH_FILE -@@ -624,21 +624,21 @@ actions compile.c.pch +@@ -624,21 +624,21 @@ ### # Declare flags and action for compilation. diff --git a/0002-boost-1.78.0-no-rpath.patch b/0002-boost-1.78.0-no-rpath.patch deleted file mode 100644 index 1c519cd5d0dd833f9eadec849048606493cc9aa2..0000000000000000000000000000000000000000 --- a/0002-boost-1.78.0-no-rpath.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- boost_1_66_0/tools/build/src/tools/gcc.jam~ 2018-01-19 13:23:45.361330881 +0000 -+++ boost_1_66_0/tools/build/src/tools/gcc.jam 2018-01-19 13:23:45.362330880 +0000 -@@ -1191,7 +1191,7 @@ rule link ( targets * : sources * : prop - - actions link bind LIBRARIES - { -- "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,$(RPATH) -Wl,-rpath-link$(SPACE)-Wl,"$(RPATH_LINK)" -o "$(<)" $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS) -+ "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -o "$(<)" $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS) - } - - actions link.dll bind LIBRARIES -@@ -1204,7 +1204,7 @@ rule link.dll ( targets * : sources * : - - actions link.dll bind LIBRARIES - { -- "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,$(RPATH) "$(.IMPLIB-COMMAND)$(<[1])" -o "$(<[-1])" $(HAVE_SONAME)-Wl,$(SONAME_OPTION)$(SPACE)-Wl,$(<[-1]:D=) -shared $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS) -+ "$(CONFIG_COMMAND)" -L"$(LINKPATH)" "$(.IMPLIB-COMMAND)$(<[1])" -o "$(<[-1])" $(HAVE_SONAME)-Wl,$(SONAME_OPTION)$(SPACE)-Wl,$(<[-1]:D=) -shared $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS) - } - - ### diff --git a/0002-boost-1.83.0-no-rpath.patch b/0002-boost-1.83.0-no-rpath.patch new file mode 100644 index 0000000000000000000000000000000000000000..b99d1a182a775eddebd4ee0aba1205f010d9a892 --- /dev/null +++ b/0002-boost-1.83.0-no-rpath.patch @@ -0,0 +1,17 @@ +--- a/tools/build/src/tools/gcc.jam.orig 2023-11-12 15:29:54.918500324 +0800 ++++ b/tools/build/src/tools/gcc.jam 2023-11-12 15:30:55.001172484 +0800 +@@ -1035,12 +1035,12 @@ + + actions link bind LIBRARIES + { +- "$(CONFIG_COMMAND)" @($(<[1]:T).rsp:O=FC:<=@":>=":E=-L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,$(RPATH) -Wl,-rpath-link$(SPACE)-Wl,"$(RPATH_LINK)" -o "$(<)" $(START-GROUP) "$(>:T)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS)) ++ "$(CONFIG_COMMAND)" @($(<[1]:T).rsp:O=FC:<=@":>=":E=-L"$(LINKPATH)" -o "$(<)" $(START-GROUP) "$(>:T)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS)) + } + + actions link.dll bind LIBRARIES + { +- "$(CONFIG_COMMAND)" @($(<[1]:T).rsp:O=FC:<=@":>=":E=-L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,$(RPATH) -Wl,$(IMPLIB_OPTION:E=--out-implib),"$(<[2])" -o "$(<[1])" $(HAVE_SONAME)-Wl,$(SONAME_OPTION)$(SPACE)-Wl,"$(SONAME_PREFIX:E=)$(<[1]:D=)" $(SHARED_OPTION:E=-shared) $(START-GROUP) "$(>:T)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS)) ++ "$(CONFIG_COMMAND)" @($(<[1]:T).rsp:O=FC:<=@":>=":E=-L"$(LINKPATH)" -o "$(<[1])" $(HAVE_SONAME)-Wl,$(SONAME_OPTION)$(SPACE)-Wl,"$(SONAME_PREFIX:E=)$(<[1]:D=)" $(SHARED_OPTION:E=-shared) $(START-GROUP) "$(>:T)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS)) + } + + ### diff --git a/0007-boost-1.74.0-linking.patch b/0007-boost-1.74.0-linking.patch deleted file mode 100644 index e4012db10db9bd37fed0da7c718e8503d61649e0..0000000000000000000000000000000000000000 --- a/0007-boost-1.74.0-linking.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up ./tools/build/src/tools/gcc.jam.orig ./tools/build/src/tools/gcc.jam ---- ./tools/build/src/tools/gcc.jam.orig 2020-01-24 22:59:03.119054312 +0200 -+++ ./tools/build/src/tools/gcc.jam 2020-01-24 23:01:07.875695346 +0200 -@@ -1093,7 +1093,7 @@ rule link ( targets * : sources * : prop - - actions link bind LIBRARIES - { -- "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -o "$(<)" $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS) -+ "$(CONFIG_COMMAND)" $(OPTIONS) $(USER_OPTIONS) -L"$(LINKPATH)" -o "$(<)" $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) - } - - actions link.dll bind LIBRARIES -@@ -1106,7 +1106,7 @@ rule link.dll ( targets * : sources * : - - actions link.dll bind LIBRARIES - { -- "$(CONFIG_COMMAND)" -L"$(LINKPATH)" "$(.IMPLIB-COMMAND)$(<[1])" -o "$(<[-1])" $(HAVE_SONAME)-Wl,$(SONAME_OPTION)$(SPACE)-Wl,$(<[-1]:D=) -shared $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS) -+ "$(CONFIG_COMMAND)" $(OPTIONS) $(USER_OPTIONS) -L"$(LINKPATH)" "$(.IMPLIB-COMMAND)$(<[1])" -o "$(<[-1])" $(HAVE_SONAME)-Wl,$(SONAME_OPTION)$(SPACE)-Wl,$(<[-1]:D=) -shared $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) - } - - ### diff --git a/0007-boost-1.83.0-linking.patch b/0007-boost-1.83.0-linking.patch new file mode 100644 index 0000000000000000000000000000000000000000..3f3535afc4757e0b3ffaf469ae7c4467bbce78ef --- /dev/null +++ b/0007-boost-1.83.0-linking.patch @@ -0,0 +1,17 @@ +--- a/tools/build/src/tools/gcc.jam 2023-11-12 15:33:20.730802407 +0800 ++++ b/tools/build/src/tools/gcc.jam 2023-11-12 15:34:24.118511013 +0800 +@@ -1035,12 +1035,12 @@ + + actions link bind LIBRARIES + { +- "$(CONFIG_COMMAND)" @($(<[1]:T).rsp:O=FC:<=@":>=":E=-L"$(LINKPATH)" -o "$(<)" $(START-GROUP) "$(>:T)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS)) ++ "$(CONFIG_COMMAND)" @($(<[1]:T).rsp:O=FC:<=@":>=":E=-L"$(LINKPATH)" $(OPTIONS) $(USER_OPTIONS) -o "$(<)" $(START-GROUP) "$(>:T)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP)) + } + + actions link.dll bind LIBRARIES + { +- "$(CONFIG_COMMAND)" @($(<[1]:T).rsp:O=FC:<=@":>=":E=-L"$(LINKPATH)" -o "$(<[1])" $(HAVE_SONAME)-Wl,$(SONAME_OPTION)$(SPACE)-Wl,"$(SONAME_PREFIX:E=)$(<[1]:D=)" $(SHARED_OPTION:E=-shared) $(START-GROUP) "$(>:T)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS)) ++ "$(CONFIG_COMMAND)" @($(<[1]:T).rsp:O=FC:<=@":>=":E=-L"$(LINKPATH)" $(OPTIONS) $(USER_OPTIONS) -o "$(<[1])" $(HAVE_SONAME)-Wl,$(SONAME_OPTION)$(SPACE)-Wl,"$(SONAME_PREFIX:E=)$(<[1]:D=)" $(SHARED_OPTION:E=-shared) $(START-GROUP) "$(>:T)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP)) + } + + ### diff --git a/0011-add-loongarch64-support-for-boost-1.81.patch b/0011-add-loongarch64-support-for-boost-1.81.patch deleted file mode 100644 index 2f2cf7b6c82f8d3a632c29fdea684112ecd50c03..0000000000000000000000000000000000000000 --- a/0011-add-loongarch64-support-for-boost-1.81.patch +++ /dev/null @@ -1,85 +0,0 @@ -From c14b7c6d206fb579fa169f5d288ce1c49d391e49 Mon Sep 17 00:00:00 2001 -From: Wenlong Zhang -Date: Wed, 29 Nov 2023 07:45:19 +0000 -Subject: [PATCH] add loongarch64 support for boost 1.81 - ---- - boostcpp.jam | 5 +++-- - libs/config/checks/architecture/Jamfile.jam | 1 + - libs/config/checks/architecture/loongarch.cpp | 11 +++++++++++ - tools/build/src/engine/jam.h | 4 ++++ - 4 files changed, 19 insertions(+), 2 deletions(-) - create mode 100644 libs/config/checks/architecture/loongarch.cpp - -diff --git a/boostcpp.jam b/boostcpp.jam -index 082536e2a..7565dae80 100644 ---- a/boostcpp.jam -+++ b/boostcpp.jam -@@ -634,7 +634,7 @@ rule address-model ( ) - return @boostcpp.deduce-address-model ; - } - --local deducable-architectures = arm mips1 power riscv s390x sparc x86 combined ; -+local deducable-architectures = arm loongarch mips1 power riscv s390x sparc x86 combined ; - feature.feature deduced-architecture : $(deducable-architectures) : propagated optional composite hidden ; - for a in $(deducable-architectures) - { -@@ -645,9 +645,10 @@ rule deduce-architecture ( properties * ) - { - local result ; - local filtered = [ toolset-properties $(properties) ] ; -- local names = arm mips1 power riscv s390x sparc x86 combined ; -+ local names = arm loongarch mips1 power riscv s390x sparc x86 combined ; - local idx = [ configure.find-builds "default architecture" : $(filtered) - : /boost/architecture//arm -+ : /boost/architecture//loongarch - : /boost/architecture//mips1 - : /boost/architecture//power - : /boost/architecture//riscv -diff --git a/libs/config/checks/architecture/Jamfile.jam b/libs/config/checks/architecture/Jamfile.jam -index c3779d917..ea41afb4a 100644 ---- a/libs/config/checks/architecture/Jamfile.jam -+++ b/libs/config/checks/architecture/Jamfile.jam -@@ -18,6 +18,7 @@ obj 64 : 64.cpp ; - - obj arm : arm.cpp ; - obj combined : combined.cpp ; -+obj loongarch : loongarch.cpp ; - obj mips : mips.cpp ; - alias mips1 : mips ; # Backwards compatibility - obj power : power.cpp ; -diff --git a/libs/config/checks/architecture/loongarch.cpp b/libs/config/checks/architecture/loongarch.cpp -new file mode 100644 -index 000000000..5be8cb09b ---- /dev/null -+++ b/libs/config/checks/architecture/loongarch.cpp -@@ -0,0 +1,11 @@ -+// loongarch.cpp -+// -+// Copyright (c) 2012 Steven Watanabe -+// -+// Distributed under the Boost Software License Version 1.0. (See -+// accompanying file LICENSE_1_0.txt or copy at -+// http://www.boost.org/LICENSE_1_0.txt) -+ -+#if !defined(__loongarch__) -+#error "Not LoongArch" -+#endif -diff --git a/tools/build/src/engine/jam.h b/tools/build/src/engine/jam.h -index b6f291865..27772284e 100644 ---- a/tools/build/src/engine/jam.h -+++ b/tools/build/src/engine/jam.h -@@ -437,6 +437,10 @@ - #define OSPLAT "OSPLAT=PARISC" - #endif - -+#ifdef __loongarch64 -+ #define OSPLAT "OSPLAT=LOONGARCH64" -+#endif -+ - #ifndef OSPLAT - #define OSPLAT "" - #endif --- -2.41.0 - diff --git a/boost.spec b/boost.spec index 9c4cbb63c8fe3ded6b0982de5ab606840e0473ef..4179deddadec60d5f8d28e85d2e7c76744a225be 100644 --- a/boost.spec +++ b/boost.spec @@ -1,4 +1,4 @@ -%define anolis_release 6 +%define anolis_release 1 %global boost_docdir __tmp_docdir %global boost_examplesdir __tmp_examplesdir @@ -30,7 +30,7 @@ %bcond_with docs_generated Name: boost -Version: 1.81.0 +Version: 1.83.0 Release: %{anolis_release}%{dist} License: Boost and MIT and Python Summary: The free peer-reviewed portable C++ source libraries @@ -41,8 +41,8 @@ Source0: https://boostorg.jfrog.io/artifactory/main/release/%{version}/source/% Source1: libboost_thread.so Source2: b2.1 -Patch0001: 0001-boost-1.81.0-build-optflags.patch -Patch0002: 0002-boost-1.78.0-no-rpath.patch +Patch0001: 0001-boost-1.83.0-build-optflags.patch +Patch0002: 0002-boost-1.83.0-no-rpath.patch # https://lists.boost.org/Archives/boost/2020/04/248812.php Patch0003: 0003-boost-1.73.0-cmakedir.patch Patch0004: 0004-boost-1.78.0-b2-build-flags.patch @@ -51,7 +51,7 @@ Patch0005: 0005-boost-1.76.0-random-test.patch # https://svn.boost.org/trac/boost/ticket/9038 Patch0006: 0006-boost-1.81.0-pool-test_linking.patch # Fix library overlinking -Patch0007: 0007-boost-1.74.0-linking.patch +Patch0007: 0007-boost-1.83.0-linking.patch # Fix linking with py3 Patch0008: 0008-boost-1.57.0-python-libpython_dep.patch # Hack to fix mpi build @@ -60,7 +60,6 @@ Patch0009: 0009-boost-1.72.0-mpi-python-build.patch # https://github.com/boostorg/phoenix/issues/111 # https://github.com/boostorg/phoenix/pull/112 Patch0010: 0010-stl-tuple-change-uarg-N-to-internal-linkage.patch -Patch0011: 0011-add-loongarch64-support-for-boost-1.81.patch BuildRequires: gcc-c++ python3 m4 lua-posix bison zlib-devel libicu-devel BuildRequires: libstdc++-devel bzip2-devel xz-devel libzstd-devel @@ -1250,10 +1249,13 @@ fi %doc %{boost_docdir}/* %changelog -* Wed Nov 29 7 2023 Wenlong Zhang - 1.81.0-6 +* Mon Dec 4 2023 Funda Wang - 1.83.0-1 +- New version 1.83.0 + +* Wed Nov 29 2023 Wenlong Zhang - 1.81.0-6 - add loongarch64 support for boost 1.81 -* Mon Nov 13 7 2023 Wenlong Zhang - 1.81.0-5 +* Mon Nov 13 2023 Wenlong Zhang - 1.81.0-5 - Remove useless patches for loongarch * Tue Nov 7 2023 Wenlong Zhang - 1.81.0-4 diff --git a/boost_1_81_0.tar.bz2 b/boost_1_83_0.tar.bz2 similarity index 85% rename from boost_1_81_0.tar.bz2 rename to boost_1_83_0.tar.bz2 index 15dda77a73711c9142825d7e1438dacfec2207e3..35f36a63c02371411aaf6100897fbe966617ad2a 100644 Binary files a/boost_1_81_0.tar.bz2 and b/boost_1_83_0.tar.bz2 differ