Thanks, applied as 630b0c0dbda1b67f3859fe71c6240102941a507f. Michael
[sent from post-receive hook] On Sat, 17 May 2025 00:02:55 +0200, baycan vural <[email protected]> wrote: > Signed-off-by: Baycan Vural <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > diff --git a/rules/boost.in b/rules/boost.in > index 095d22caff25..4cca584a9f05 100644 > --- a/rules/boost.in > +++ b/rules/boost.in > @@ -48,27 +48,33 @@ config BOOST_ATOMIC > help > Boost atomic library > > +config BOOST_CHARCONV > + bool > + select BOOST_LIBS > + prompt "charconv" > + help > + Boost charconv library > + > config BOOST_CHRONO > bool > select BOOST_LIBS > - select BOOST_SYSTEM > prompt "chrono" > help > Boost chrono library > > -config BOOST_CONTAINER > +config BOOST_COBALT > bool > select BOOST_LIBS > - prompt "container" > + prompt "cobalt" > help > - Boost container library > + Boost cobalt library > > -config BOOST_CONTRACT > +config BOOST_CONTAINER > bool > select BOOST_LIBS > - prompt "contract" > + prompt "container" > help > - Boost contract library > + Boost container library > > config BOOST_CONTEXT > bool > @@ -77,13 +83,17 @@ config BOOST_CONTEXT > help > Boost context library > > +config BOOST_CONTRACT > + bool > + select BOOST_LIBS > + prompt "contract" > + help > + Boost contract library > + > config BOOST_COROUTINE > bool > select BOOST_LIBS > - select BOOST_CHRONO > select BOOST_CONTEXT > - select BOOST_SYSTEM > - select BOOST_THREAD > prompt "coroutine (deprecated)" > help > Boost coroutine library > @@ -106,7 +116,9 @@ config BOOST_EXCEPTION > config BOOST_FIBER > bool > select BOOST_LIBS > + select BOOST_ATOMIC > select BOOST_CONTEXT > + select BOOST_FILESYSTEM > prompt "fiber" > help > Boost fiber library > @@ -114,6 +126,7 @@ config BOOST_FIBER > config BOOST_FILESYSTEM > bool > select BOOST_LIBS > + select BOOST_ATOMIC > prompt "filesystem" > help > Boost filesystem library > @@ -121,7 +134,6 @@ config BOOST_FILESYSTEM > config BOOST_GRAPH > bool > select BOOST_LIBS > - select BOOST_REGEX > prompt "graph" > help > Boost graph library > @@ -137,12 +149,6 @@ config BOOST_GRAPH_PARALLEL > help > Boost graph_parallel library > > -config BOOST_HEADERS > - bool > - prompt "headers" > - help > - boost headers library > - > config BOOST_IOSTREAMS > bool > select BOOST_LIBS > @@ -152,13 +158,17 @@ config BOOST_IOSTREAMS > > config BOOST_JSON > bool > + select BOOST_LIBS > + select BOOST_CONTAINER > prompt "json" > help > - boost json library > + Boost json library > > config BOOST_LOCALE > bool > select BOOST_LIBS > + select BOOST_THREAD > + select BOOST_CHRONO > prompt "locale" > help > Boost locale library > @@ -168,10 +178,7 @@ config BOOST_LOG > select BOOST_LIBS > select BOOST_ATOMIC > select BOOST_CHRONO > - select BOOST_DATE_TIME > select BOOST_FILESYSTEM > - select BOOST_REGEX > - select BOOST_SYSTEM > select BOOST_THREAD > prompt "log" > help > @@ -196,9 +203,25 @@ config BOOST_MPI > > config BOOST_NOWIDE > bool > + select BOOST_LIBS > prompt "nowide" > help > - boost nowide library > + Boost nowide library > + > +config BOOST_PREDEF > + bool > + prompt "predef" > + help > + Boost predef library > + > +config BOOST_PROCESS > + bool > + select BOOST_LIBS > + select BOOST_ATOMIC > + select BOOST_FILESYSTEM > + prompt "process" > + help > + Boost process library > > config BOOST_PROGRAM_OPTIONS > bool > @@ -210,7 +233,6 @@ config BOOST_PROGRAM_OPTIONS > config BOOST_RANDOM > bool > select BOOST_LIBS > - select BOOST_SYSTEM > prompt "random" > help > Boost random library > @@ -255,7 +277,6 @@ config BOOST_TEST > config BOOST_THREAD > bool > select BOOST_LIBS > - select BOOST_SYSTEM > prompt "thread" > help > Portable C++ multi-threading library > @@ -263,8 +284,6 @@ config BOOST_THREAD > config BOOST_TIMER > bool > select BOOST_LIBS > - select BOOST_CHRONO > - select BOOST_SYSTEM > prompt "timer" > help > Boost timer library > @@ -276,22 +295,20 @@ config BOOST_TYPE_ERASURE > select BOOST_SYSTEM > select BOOST_THREAD > prompt "type_erasure" > - help > - boost type_erasure library > > config BOOST_URL > bool > + select BOOST_LIBS > prompt "url" > help > - boost url library > + Boost url library > > config BOOST_WAVE > bool > select BOOST_LIBS > select BOOST_CHRONO > - select BOOST_DATE_TIME > + select BOOST_ATOMIC > select BOOST_FILESYSTEM > - select BOOST_SYSTEM > select BOOST_THREAD > prompt "wave" > help > diff --git a/rules/boost.make b/rules/boost.make > index 3f4199e4beff..a75d73e082d0 100644 > --- a/rules/boost.make > +++ b/rules/boost.make > @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_BOOST) += boost > # > # Paths and names > # > -BOOST_VERSION := 1_83_0 > -BOOST_MD5 := 406f0b870182b4eb17a23a9d8fce967d > +BOOST_VERSION := 1_86_0 > +BOOST_MD5 := 2d098ba2e1457708a02de996857c2b10 > BOOST := boost_$(BOOST_VERSION) > BOOST_SUFFIX := tar.bz2 > BOOST_URL := $(call ptx/mirror, SF, boost/$(BOOST).$(BOOST_SUFFIX)) > @@ -29,13 +29,15 @@ BOOST_LICENSE_FILES := > file://LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d7 > # Prepare > # > ---------------------------------------------------------------------------- > > -# boost doesn't provide "no library" choice. If the library list is empty, it > -# goes for all libraries. We start at least with date_time lib here to avoid > +# "headers" is the fake library to install headers. If the library list is > empty, > +# it goes for all libraries. We start at least with headers lib here to avoid > # this > -BOOST_LIBRARIES-y := date_time > +BOOST_LIBRARIES-y := headers > > BOOST_LIBRARIES-$(PTXCONF_BOOST_ATOMIC) += atomic > +BOOST_LIBRARIES-$(PTXCONF_BOOST_CHARCONV) += charconv > BOOST_LIBRARIES-$(PTXCONF_BOOST_CHRONO) += chrono > +BOOST_LIBRARIES-$(PTXCONF_BOOST_COBALT) += cobalt > BOOST_LIBRARIES-$(PTXCONF_BOOST_CONTAINER) += container > BOOST_LIBRARIES-$(PTXCONF_BOOST_CONTEXT) += context > BOOST_LIBRARIES-$(PTXCONF_BOOST_CONTRACT) += contract > @@ -46,7 +48,6 @@ BOOST_LIBRARIES-$(PTXCONF_BOOST_FIBER) += fiber > BOOST_LIBRARIES-$(PTXCONF_BOOST_FILESYSTEM) += filesystem > BOOST_LIBRARIES-$(PTXCONF_BOOST_GRAPH) += graph > BOOST_LIBRARIES-$(PTXCONF_BOOST_GRAPH_PARALLEL) += graph_parallel > -BOOST_LIBRARIES-$(PTXCONF_BOOST_HEADERS) += headers > BOOST_LIBRARIES-$(PTXCONF_BOOST_IOSTREAMS) += iostreams > BOOST_LIBRARIES-$(PTXCONF_BOOST_JSON) += json > BOOST_LIBRARIES-$(PTXCONF_BOOST_LOCALE) += locale > @@ -54,6 +55,8 @@ BOOST_LIBRARIES-$(PTXCONF_BOOST_LOG) += log > BOOST_LIBRARIES-$(PTXCONF_BOOST_MATH) += math > BOOST_LIBRARIES-$(PTXCONF_BOOST_MPI) += mpi > BOOST_LIBRARIES-$(PTXCONF_BOOST_NOWIDE) += nowide > +BOOST_LIBRARIES-$(PTXCONF_BOOST_PREDEF) += predef > +BOOST_LIBRARIES-$(PTXCONF_BOOST_PROCESS) += process > BOOST_LIBRARIES-$(PTXCONF_BOOST_PROGRAM_OPTIONS)+= program_options > BOOST_LIBRARIES-$(PTXCONF_BOOST_PYTHON) += python > BOOST_LIBRARIES-$(PTXCONF_BOOST_RANDOM) += random > @@ -159,14 +162,7 @@ $(STATEDIR)/boost.install: > # Target-Install > # > ---------------------------------------------------------------------------- > > -# date_time is append to libraries list as minimum, however we only install > it > -# to target if it is really selected > -ifndef PTXCONF_BOOST_DATE_TIME > -BOOST_INST_LIBRARIES := $(filter-out date_time,$(BOOST_LIBRARIES-y)) > -else > -BOOST_INST_LIBRARIES := $(BOOST_LIBRARIES-y) > -endif > -BOOST_INST_LIBRARIES := $(addsuffix *.so*,$(addprefix > */libboost_,$(BOOST_INST_LIBRARIES))) > +BOOST_INST_LIBRARIES := $(addsuffix *.so*,$(addprefix > */libboost_,$(BOOST_LIBRARIES-y))) > > $(STATEDIR)/boost.targetinstall: > @$(call targetinfo)
