Update boost packages to 1.87.0

Martchus · Dec 22, 2024 · 64eb47f · 64eb47f
1 parent 109b44c
commit 64eb47f
Show file tree

Hide file tree

Showing 9 changed files with 63 additions and 27 deletions.
diff --git a/boost/android-aarch64/PKGBUILD b/boost/android-aarch64/PKGBUILD
@@ -5,7 +5,7 @@
 
 _android_arch=aarch64
 pkgname=android-${_android_arch}-boost
-pkgver=1.86.0
+pkgver=1.87.0
 pkgrel=1
 _srcname=boost_${pkgver//./_}
 arch=('any')
@@ -20,7 +20,7 @@ makedepends=('android-environment')
 options=(!strip !buildflags staticlibs !emptydirs)
 source=("https://boostorg.jfrog.io/artifactory/main/release/$pkgver/source/$_srcname.tar.bz2"
         "disable-version-check.patch")
-sha256sums=('1bed88e40401b2cb7a1f76d4bab499e352fa4d0c5f31c0dbae64e24d34d7513b'
+sha256sums=('af57be25cb4c4f4b413ed692fe378affb4352ea50fbe294a11ef548f4d527d89'
             '63d12e7d703b471882608b4225c489f6a35ab425602783a4f9c4ea99a10f9c4b')
 
 prepare() {

diff --git a/boost/android-armv7a-eabi/PKGBUILD b/boost/android-armv7a-eabi/PKGBUILD
@@ -5,7 +5,7 @@
 
 _android_arch=armv7a-eabi
 pkgname=android-${_android_arch}-boost
-pkgver=1.86.0
+pkgver=1.87.0
 pkgrel=1
 _srcname=boost_${pkgver//./_}
 arch=('any')
@@ -20,7 +20,7 @@ makedepends=('android-environment')
 options=(!strip !buildflags staticlibs !emptydirs)
 source=("https://boostorg.jfrog.io/artifactory/main/release/$pkgver/source/$_srcname.tar.bz2"
         "disable-version-check.patch")
-sha256sums=('1bed88e40401b2cb7a1f76d4bab499e352fa4d0c5f31c0dbae64e24d34d7513b'
+sha256sums=('af57be25cb4c4f4b413ed692fe378affb4352ea50fbe294a11ef548f4d527d89'
             '63d12e7d703b471882608b4225c489f6a35ab425602783a4f9c4ea99a10f9c4b')
 
 prepare() {

diff --git a/boost/android-x86-64/PKGBUILD b/boost/android-x86-64/PKGBUILD
@@ -5,7 +5,7 @@
 
 _android_arch=x86-64
 pkgname=android-${_android_arch}-boost
-pkgver=1.86.0
+pkgver=1.87.0
 pkgrel=1
 _srcname=boost_${pkgver//./_}
 arch=('any')
@@ -20,7 +20,7 @@ makedepends=('android-environment')
 options=(!strip !buildflags staticlibs !emptydirs)
 source=("https://boostorg.jfrog.io/artifactory/main/release/$pkgver/source/$_srcname.tar.bz2"
         "disable-version-check.patch")
-sha256sums=('1bed88e40401b2cb7a1f76d4bab499e352fa4d0c5f31c0dbae64e24d34d7513b'
+sha256sums=('af57be25cb4c4f4b413ed692fe378affb4352ea50fbe294a11ef548f4d527d89'
             '63d12e7d703b471882608b4225c489f6a35ab425602783a4f9c4ea99a10f9c4b')
 
 prepare() {

diff --git a/boost/android-x86/PKGBUILD b/boost/android-x86/PKGBUILD
@@ -5,7 +5,7 @@
 
 _android_arch=x86
 pkgname=android-${_android_arch}-boost
-pkgver=1.86.0
+pkgver=1.87.0
 pkgrel=1
 _srcname=boost_${pkgver//./_}
 arch=('any')
@@ -20,7 +20,7 @@ makedepends=('android-environment')
 options=(!strip !buildflags staticlibs !emptydirs)
 source=("https://boostorg.jfrog.io/artifactory/main/release/$pkgver/source/$_srcname.tar.bz2"
         "disable-version-check.patch")
-sha256sums=('1bed88e40401b2cb7a1f76d4bab499e352fa4d0c5f31c0dbae64e24d34d7513b'
+sha256sums=('af57be25cb4c4f4b413ed692fe378affb4352ea50fbe294a11ef548f4d527d89'
             '63d12e7d703b471882608b4225c489f6a35ab425602783a4f9c4ea99a10f9c4b')
 
 prepare() {

diff --git a/boost/doc/PKGBUILD b/boost/doc/PKGBUILD
@@ -1,6 +1,6 @@
 _pkgbase=boost
 pkgname=boost-doc
-pkgver=1.86.0
+pkgver=1.87.0
 _srcname=boost_${pkgver//./_}
 pkgrel=1
 pkgdesc='Free peer-reviewed portable C++ source libraries (HTML documentation)'
@@ -9,7 +9,7 @@ arch=('x86_64')
 license=('custom')
 makedepends=()
 source=(https://boostorg.jfrog.io/artifactory/main/release/$pkgver/source/$_srcname.tar.bz2)
-sha256sums=('1bed88e40401b2cb7a1f76d4bab499e352fa4d0c5f31c0dbae64e24d34d7513b')
+sha256sums=('af57be25cb4c4f4b413ed692fe378affb4352ea50fbe294a11ef548f4d527d89')
 options=(!strip)
 
 package() {

diff --git a/boost/mingw-w64/0003-fix-build-context-with-CMake-on-arm64.patch b/boost/mingw-w64/0003-fix-build-context-with-CMake-on-arm64.patch
@@ -0,0 +1,37 @@
+--- a/libs/context/CMakeLists.txt
++++ b/libs/context/CMakeLists.txt
+@@ -89,18 +89,21 @@
+   else()
+     set(_default_asm masm)
+   endif()
++elseif( CMAKE_CXX_COMPILER_ID STREQUAL Clang AND BOOST_CONTEXT_ARCHITECTURE STREQUAL arm64 AND WIN32 )
++  set(_default_asm armclang)
+ else()
+   set(_default_asm gas)
+ endif()
+
+-set(BOOST_CONTEXT_ASSEMBLER "${_default_asm}" CACHE STRING "Boost.Context assembler (masm, gas, armasm)")
+-set_property(CACHE BOOST_CONTEXT_ASSEMBLER PROPERTY STRINGS masm gas armasm)
++set(BOOST_CONTEXT_ASSEMBLER "${_default_asm}" CACHE STRING "Boost.Context assembler (masm, gas, armasm, armclang)")
++set_property(CACHE BOOST_CONTEXT_ASSEMBLER PROPERTY STRINGS masm gas armasm armclang)
+
+ unset(_default_asm)
+
+ ## Assembler source suffix
+-
+-if(BOOST_CONTEXT_BINARY_FORMAT STREQUAL pe)
++if(BOOST_CONTEXT_ASSEMBLER STREQUAL armclang)
++  set(_default_ext .S)
++elseif(BOOST_CONTEXT_BINARY_FORMAT STREQUAL pe)
+   set(_default_ext .asm)
+ elseif(BOOST_CONTEXT_ASSEMBLER STREQUAL gas)
+   set(_default_ext .S)
+@@ -135,7 +138,7 @@
+ # Enable the right assembler
+
+ if(BOOST_CONTEXT_IMPLEMENTATION STREQUAL "fcontext")
+-  if(BOOST_CONTEXT_ASSEMBLER STREQUAL gas)
++  if(BOOST_CONTEXT_ASSEMBLER STREQUAL gas OR BOOST_CONTEXT_ASSEMBLER STREQUAL armclang)
+     if(CMAKE_CXX_PLATFORM_ID MATCHES "Cygwin")
+       enable_language(ASM-ATT)
+     else()
diff --git a/boost/mingw-w64/PKGBUILD b/boost/mingw-w64/PKGBUILD
@@ -1,20 +1,23 @@
 pkgname=mingw-w64-boost
-pkgver=1.86.0
+pkgver=1.87.0
 _boostver=${pkgver//./_}
-pkgrel=2
+pkgrel=1
 pkgdesc="Free peer-reviewed portable C++ source libraries (mingw-w64)"
 arch=('any')
 url="http://www.boost.org/"
 license=('custom')
 depends=('mingw-w64-zstd' 'mingw-w64-bzip2' 'mingw-w64-dlfcn')
 makedepends=('mingw-w64-gcc' 'mingw-w64-cmake' 'ninja')
+[[ $pkgname =~ .*-clang-.* ]] && makedepends+=('mingw-w64-binutils') # for windmc
 options=('!strip' '!buildflags' 'staticlibs')
 source=(https://github.com/boostorg/boost/releases/download/boost-${pkgver}/boost-${pkgver}-cmake.tar.xz
-       0001-Fix-building-with-cmake-on-MINGW.patch)
-sha256sums=('2c5ec5edcdff47ff55e27ed9560b0a0b94b07bd07ed9928b476150e16b0efc57'
-            'abc6c78a252165df1de504d854d942eb486d88f06a6423d8b99dfec6ab138170')
+       0001-Fix-building-with-cmake-on-MINGW.patch
+       0003-fix-build-context-with-CMake-on-arm64.patch)
+sha256sums=('7da75f171837577a52bbf217e17f8ea576c7c246e4594d617bfde7fafd408be5'
+            'abc6c78a252165df1de504d854d942eb486d88f06a6423d8b99dfec6ab138170'
+            'ac6f996db2d5e2e5870b1a2d26c3b7d022f09d5be94945451d90875e8d4ecda4')
 
-_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
+_architectures=(i686-w64-mingw32 x86_64-w64-mingw32)
 
 _configurations=()
 [[ $NO_SHARED_LIBS ]] || _configurations+=('shared')
@@ -32,6 +35,7 @@ prepare() {
   sed -i "160i\ \ \ \ <target-os>windows:<library>dl" libs/stacktrace/build/Jamfile.v2
 
   patch -p1 -i ../0001-Fix-building-with-cmake-on-MINGW.patch
+  patch -p1 -i ../0003-fix-build-context-with-CMake-on-arm64.patch
 }
 
 build() {
@@ -49,15 +53,10 @@ build() {
     for _cfg in "${_configurations[@]}"; do
       msg2 "${_arch}-${_cfg}"
 
-      if [[ $_arch =~ aarch64-.* ]]; then
-        # skip context and anything depending on it for now due to:
-        # ld.lld: error: undefined symbol: __declspec(dllimport) make_fcontext
-        # ld.lld: error: undefined symbol: __declspec(dllimport) ontop_fcontext
-        _arch_config=("-DBOOST_EXCLUDE_LIBRARIES='context;cobalt;log;process;coroutine;fiber'")
-      fi
-
       ${_arch}-cmake -G Ninja -B "build-${_arch}-${_cfg}" -S "$srcdir/boost-$pkgver" \
         -DBOOST_INSTALL_LAYOUT=system \
+        -DBOOST_STACKTRACE_ENABLE_FROM_EXCEPTION=OFF \
+        -DBUILD_TESTING=OFF \
         ${_config_flags[$_cfg]} ${_arch_config[$_cfg]}
       VERBOSE=1 cmake --build "build-${_arch}-${_cfg}"
     done

diff --git a/boost/static-compat/PKGBUILD b/boost/static-compat/PKGBUILD
@@ -11,7 +11,7 @@
 
 _pkgname=boost
 pkgname=static-compat-$_pkgname
-pkgver=1.86.0
+pkgver=1.87.0
 pkgrel=1
 _srcname=boost_${pkgver//./_}
 pkgdesc="Free peer-reviewed portable C++ source libraries"
@@ -22,7 +22,7 @@ options=('staticlibs')
 depends=('static-compat-zlib' 'static-compat-zstd' 'static-compat-bzip2')
 makedepends=('static-compat-environment')
 source=(https://boostorg.jfrog.io/artifactory/main/release/$pkgver/source/$_srcname.tar.bz2)
-sha256sums=('1bed88e40401b2cb7a1f76d4bab499e352fa4d0c5f31c0dbae64e24d34d7513b')
+sha256sums=('af57be25cb4c4f4b413ed692fe378affb4352ea50fbe294a11ef548f4d527d89')
 
 prepare() {
   cd $_srcname

diff --git a/syncthingtray/mingw-w64-qt6/PKGBUILD b/syncthingtray/mingw-w64-qt6/PKGBUILD
@@ -17,7 +17,7 @@ pkgname=mingw-w64-syncthingtray-qt6
 _name=${pkgname#mingw-w64-}
 _name=${_name%-qt6}
 pkgver=1.6.4
-pkgrel=1
+pkgrel=2
 arch=('any')
 pkgdesc='Tray application for Syncthing (mingw-w64)'
 license=(GPL-2-or-later)
@@ -92,7 +92,7 @@ build() {
       msg2 "${_arch}-${_cfg}"
       local arch_flags=()
       [[ $_arch =~ aarch64-.* ]] && arch_flags+=(
-        -DUSE_BOOST_PROCESS:BOOL=OFF
+        -DUSE_BOOST_PROCESS:BOOL=ON # supposed to work on Windows on ARM as of Boost 1.87.0
       )
       ${_arch}-cmake${_cfg_suffix[$_cfg]} \
         -G Ninja \