Revert "Bump min Boost version to 1.82 (#9317)"

This reverts commit 7c60174ad1.
This commit is contained in:
pentarctagon 2024-09-08 10:25:45 -05:00
parent 08d3f3be88
commit 40ef4dbbf4
6 changed files with 11 additions and 13 deletions

View File

@ -16,7 +16,7 @@ jobs:
# - https://gh.io/supported-runners-and-hardware-resources # - https://gh.io/supported-runners-and-hardware-resources
# - https://gh.io/using-larger-runners # - https://gh.io/using-larger-runners
# Consider using larger runners for possible analysis time improvements. # Consider using larger runners for possible analysis time improvements.
runs-on: ubuntu-24.04 runs-on: ubuntu-latest
timeout-minutes: 360 timeout-minutes: 360
permissions: permissions:
actions: read actions: read
@ -51,10 +51,10 @@ jobs:
if: matrix.language == 'cpp' if: matrix.language == 'cpp'
run: | run: |
sudo apt update sudo apt update
sudo apt install scons libboost-system1.83-dev libboost-filesystem1.83-dev libboost-iostreams1.83-dev \ sudo apt install scons libboost-system1.74-dev libboost-filesystem1.74-dev libboost-iostreams1.74-dev \
libboost-serialization1.83-dev libboost-locale1.83-dev libboost-regex1.83-dev libboost-random1.83-dev \ libboost-serialization1.74-dev libboost-locale1.74-dev libboost-regex1.74-dev libboost-random1.74-dev \
libboost-program-options1.83-dev libboost-thread1.83-dev libboost-context1.83-dev libboost-test-dev \ libboost-program-options1.74-dev libboost-thread1.74-dev libboost-context1.74-dev libboost-test-dev \
libboost-coroutine1.83-dev libboost-graph1.83-dev libasio-dev libsdl2-dev libsdl2-image-dev \ libboost-coroutine1.74-dev libboost-graph1.74-dev libasio-dev libsdl2-dev libsdl2-image-dev \
libsdl2-mixer-dev libvorbis-dev libpango1.0-dev libssl-dev libcurl4-openssl-dev liblua5.4-dev libsdl2-mixer-dev libvorbis-dev libpango1.0-dev libssl-dev libcurl4-openssl-dev liblua5.4-dev
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift). # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
- name: Autobuild - name: Autobuild

View File

@ -52,7 +52,7 @@ option(ENABLE_MYSQL "Enable building MP/add-ons servers with mysql support" OFF)
option(ENABLE_TESTS "Build unit tests") option(ENABLE_TESTS "Build unit tests")
option(ENABLE_NLS "Enable building of translations" ${ENABLE_GAME}) option(ENABLE_NLS "Enable building of translations" ${ENABLE_GAME})
set(BOOST_VERSION "1.82") set(BOOST_VERSION "1.67")
if(NOT WIN32) if(NOT WIN32)
set(Lua_FIND_VERSION_MAJOR 5) set(Lua_FIND_VERSION_MAJOR 5)

View File

@ -8,7 +8,7 @@ later, or a version of Clang with equivalent support.
You'll need to have these libraries and their development headers installed in You'll need to have these libraries and their development headers installed in
order to build Wesnoth: order to build Wesnoth:
* Boost libraries >= 1.82.0 * Boost libraries >= 1.66.0
Most headers plus the following binary libs: Most headers plus the following binary libs:
* Filesystem * Filesystem
* Locale * Locale

View File

@ -189,7 +189,7 @@ if env['distcc']:
if env['ccache']: env.Tool('ccache') if env['ccache']: env.Tool('ccache')
boost_version = "1.82" boost_version = "1.67"
def SortHelpText(a, b): def SortHelpText(a, b):
return (a > b) - (a < b) return (a > b) - (a < b)

View File

@ -1,2 +0,0 @@
### Packaging
* The minimum required Boost version is now 1.82.

View File

@ -34,12 +34,12 @@
"sources": [ "sources": [
{ {
"type": "archive", "type": "archive",
"url": "https://boostorg.jfrog.io/artifactory/main/release/1.82.0/source/boost_1_82_0.tar.bz2", "url": "https://boostorg.jfrog.io/artifactory/main/release/1.67.0/source/boost_1_67_0.tar.bz2",
"sha256": "a6e1ab9b0860e6a2881dd7b21fe9f737a095e5f33a3a874afc6a345228597ee6" "sha256": "2684c972994ee57fc5632e03bf044746f6eb45d4920c343937a465fd67a5adba"
} }
], ],
"build-commands": [ "build-commands": [
"./bootstrap.sh --prefix=/app --with-libraries=system,filesystem,locale,iostreams,program_options,regex,random,thread,coroutine,context,graph", "./bootstrap.sh --prefix=/app --with-libraries=filesystem,locale,iostreams,program_options,regex,random,thread,coroutine,context,graph",
"./b2 -j$FLATPAK_BUILDER_N_JOBS install cxxflags='-fPIE -fstack-protector-strong' define=_FORTIFY_SOURCE=2 link=static variant=release address-model=64 --layout=system" "./b2 -j$FLATPAK_BUILDER_N_JOBS install cxxflags='-fPIE -fstack-protector-strong' define=_FORTIFY_SOURCE=2 link=static variant=release address-model=64 --layout=system"
] ]
}, },