Update boost packages to 1.81.0
There are still build errors to be fixed in the Android variants.
This commit is contained in:
parent
7b5f5d2f2c
commit
1504660f55
|
@ -16,7 +16,7 @@ _boost_arch=arm
|
||||||
_boost_address_model=64
|
_boost_address_model=64
|
||||||
|
|
||||||
pkgname=android-$_pkg_arch-$_pkgname
|
pkgname=android-$_pkg_arch-$_pkgname
|
||||||
pkgver=1.76.0
|
pkgver=1.81.0
|
||||||
_srcname=boost_${pkgver//./_}
|
_srcname=boost_${pkgver//./_}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
url='https://www.boost.org/'
|
url='https://www.boost.org/'
|
||||||
|
@ -29,18 +29,26 @@ makedepends=('bzip2' 'zlib' 'android-ndk' 'android-sdk')
|
||||||
conflicts=("android-$_pkgname-$_android_arch")
|
conflicts=("android-$_pkgname-$_android_arch")
|
||||||
replaces=("android-$_pkgname-$_android_arch")
|
replaces=("android-$_pkgname-$_android_arch")
|
||||||
source=(https://boostorg.jfrog.io/artifactory/main/release/$pkgver/source/$_srcname.tar.gz
|
source=(https://boostorg.jfrog.io/artifactory/main/release/$pkgver/source/$_srcname.tar.gz
|
||||||
|
boost-1.81.0-phoenix-multiple-definitions.patch
|
||||||
$_pkgname-ublas-c++20-iterator.patch::https://github.com/boostorg/ublas/commit/a31e5cffa85f.patch
|
$_pkgname-ublas-c++20-iterator.patch::https://github.com/boostorg/ublas/commit/a31e5cffa85f.patch
|
||||||
no-versioned-shlibs.patch)
|
no-versioned-shlibs.patch
|
||||||
sha256sums=('7bd7ddceec1a1dfdcbdb3e609b60d01739c38390a5f956385a12f3122049f0ca'
|
disable-version-check.patch)
|
||||||
|
sha256sums=('71feeed900fbccca04a3b4f2f84a7c217186f28a940ed8b7ed4725986baf99fa'
|
||||||
|
'3ebf428ef6be090a7b56a233330375539ac429333b83708e28fe5db049cfecdb'
|
||||||
'aa38addb40d5f44b4a8472029b475e7e6aef1c460509eb7d8edf03491dc1b5ee'
|
'aa38addb40d5f44b4a8472029b475e7e6aef1c460509eb7d8edf03491dc1b5ee'
|
||||||
'd82d0f15064812dcabb3456a7bcb1db0e0f6145980e4728e638372e0fd35af23')
|
'd82d0f15064812dcabb3456a7bcb1db0e0f6145980e4728e638372e0fd35af23'
|
||||||
|
'4520ebaa7ca5233478024e6aa57a6c9a0893967fed4461dff6f43035790a64d9')
|
||||||
|
|
||||||
prepare() {
|
prepare() {
|
||||||
cd ${_srcname}
|
cd ${_srcname}
|
||||||
|
# https://github.com/boostorg/phoenix/issues/111
|
||||||
|
patch -Np1 -i ../boost-1.81.0-phoenix-multiple-definitions.patch
|
||||||
|
|
||||||
# https://github.com/boostorg/ublas/pull/97
|
# https://github.com/boostorg/ublas/pull/97
|
||||||
patch -Np2 -i ../$_pkgname-ublas-c++20-iterator.patch
|
patch -Np2 -i ../$_pkgname-ublas-c++20-iterator.patch
|
||||||
|
|
||||||
patch -i ../no-versioned-shlibs.patch
|
patch -i ../no-versioned-shlibs.patch
|
||||||
|
patch -i ../disable-version-check.patch
|
||||||
}
|
}
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
|
|
|
@ -0,0 +1,11 @@
|
||||||
|
https://bugs.gentoo.org/887041
|
||||||
|
https://github.com/boostorg/phoenix/issues/111
|
||||||
|
--- a/boost/phoenix/stl.hpp
|
||||||
|
+++ b/boost/phoenix/stl.hpp
|
||||||
|
@@ -11,6 +11,5 @@
|
||||||
|
|
||||||
|
#include <boost/phoenix/stl/algorithm.hpp>
|
||||||
|
#include <boost/phoenix/stl/container.hpp>
|
||||||
|
-#include <boost/phoenix/stl/tuple.hpp>
|
||||||
|
|
||||||
|
#endif
|
|
@ -1,27 +1,33 @@
|
||||||
--- a/tools/build/src/tools/common.jam 2019-09-18 16:03:02.035995695 +0200
|
--- tools/build/src/tools/common.jam.orig 2023-02-03 10:57:59.385098144 +0100
|
||||||
+++ b/tools/build/src/tools/common.jam 2019-09-18 16:03:36.386156355 +0200
|
+++ tools/build/src/tools/common.jam 2023-02-03 11:00:34.982146918 +0100
|
||||||
@@ -974,16 +974,16 @@
|
@@ -1127,18 +1127,18 @@
|
||||||
|
import $(toolset) ;
|
||||||
|
local tool-version = [ $(toolset).get-full-version $(command) ] ;
|
||||||
|
|
||||||
|
- import version ;
|
||||||
|
- if ! [ version.version-compatible [ SPLIT_BY_CHARACTERS $(version) : . ]
|
||||||
|
- : [ SPLIT_BY_CHARACTERS $(tool-version) : . ] ]
|
||||||
|
- {
|
||||||
|
- errors.error toolset $(toolset) "initialization:"
|
||||||
|
- : version '$(version)' requested but
|
||||||
|
- '$(tool)-$(version)' not found and version
|
||||||
|
- '$(tool-version:J=.)' of default '$(command)'
|
||||||
|
- does not match
|
||||||
|
- : initialized from [ errors.nearest-user-location ]
|
||||||
|
- ;
|
||||||
|
- }
|
||||||
|
+ #import version ;
|
||||||
|
+ #if ! [ version.version-compatible [ SPLIT_BY_CHARACTERS $(version) : . ]
|
||||||
|
+ # : [ SPLIT_BY_CHARACTERS $(tool-version) : . ] ]
|
||||||
|
+ #{
|
||||||
|
+ # errors.error toolset $(toolset) "initialization:"
|
||||||
|
+ # : version '$(version)' requested but
|
||||||
|
+ # '$(tool)-$(version)' not found and version
|
||||||
|
+ # '$(tool-version:J=.)' of default '$(command)'
|
||||||
|
+ # does not match
|
||||||
|
+ # : initialized from [ errors.nearest-user-location ]
|
||||||
|
+ # ;
|
||||||
|
+ #}
|
||||||
}
|
}
|
||||||
|
#3) default: no command and no version specified, try using "$(tool)"
|
||||||
# From GCC 5, versioning changes and minor becomes patch
|
else
|
||||||
- if $(tag) = gcc && [ numbers.less 4 $(version[1]) ]
|
|
||||||
- {
|
|
||||||
- version = $(version[1]) ;
|
|
||||||
- }
|
|
||||||
+ #if $(tag) = gcc && [ numbers.less 4 $(version[1]) ]
|
|
||||||
+ #{
|
|
||||||
+ # version = $(version[1]) ;
|
|
||||||
+ #}
|
|
||||||
|
|
||||||
# Ditto, from Clang 4
|
|
||||||
- if ( $(tag) = clang || $(tag) = clangw ) && [ numbers.less 3 $(version[1]) ]
|
|
||||||
- {
|
|
||||||
- version = $(version[1]) ;
|
|
||||||
- }
|
|
||||||
+ #if ( $(tag) = clang || $(tag) = clangw ) && [ numbers.less 3 $(version[1]) ]
|
|
||||||
+ #{
|
|
||||||
+ # version = $(version[1]) ;
|
|
||||||
+ #}
|
|
||||||
|
|
||||||
# On intel, version is not added, because it does not matter and it is the
|
|
||||||
# version of vc used as backend that matters. Ideally, we should encode the
|
|
||||||
|
|
|
@ -16,7 +16,7 @@ _boost_arch=arm
|
||||||
_boost_address_model=32
|
_boost_address_model=32
|
||||||
|
|
||||||
pkgname=android-$_pkg_arch-$_pkgname
|
pkgname=android-$_pkg_arch-$_pkgname
|
||||||
pkgver=1.76.0
|
pkgver=1.81.0
|
||||||
_srcname=boost_${pkgver//./_}
|
_srcname=boost_${pkgver//./_}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
url='https://www.boost.org/'
|
url='https://www.boost.org/'
|
||||||
|
@ -29,18 +29,26 @@ makedepends=('bzip2' 'zlib' 'android-ndk' 'android-sdk')
|
||||||
conflicts=("android-$_pkgname-$_android_arch")
|
conflicts=("android-$_pkgname-$_android_arch")
|
||||||
replaces=("android-$_pkgname-$_android_arch")
|
replaces=("android-$_pkgname-$_android_arch")
|
||||||
source=(https://boostorg.jfrog.io/artifactory/main/release/$pkgver/source/$_srcname.tar.gz
|
source=(https://boostorg.jfrog.io/artifactory/main/release/$pkgver/source/$_srcname.tar.gz
|
||||||
|
boost-1.81.0-phoenix-multiple-definitions.patch
|
||||||
$_pkgname-ublas-c++20-iterator.patch::https://github.com/boostorg/ublas/commit/a31e5cffa85f.patch
|
$_pkgname-ublas-c++20-iterator.patch::https://github.com/boostorg/ublas/commit/a31e5cffa85f.patch
|
||||||
no-versioned-shlibs.patch)
|
no-versioned-shlibs.patch
|
||||||
sha256sums=('7bd7ddceec1a1dfdcbdb3e609b60d01739c38390a5f956385a12f3122049f0ca'
|
disable-version-check.patch)
|
||||||
|
sha256sums=('71feeed900fbccca04a3b4f2f84a7c217186f28a940ed8b7ed4725986baf99fa'
|
||||||
|
'3ebf428ef6be090a7b56a233330375539ac429333b83708e28fe5db049cfecdb'
|
||||||
'aa38addb40d5f44b4a8472029b475e7e6aef1c460509eb7d8edf03491dc1b5ee'
|
'aa38addb40d5f44b4a8472029b475e7e6aef1c460509eb7d8edf03491dc1b5ee'
|
||||||
'd82d0f15064812dcabb3456a7bcb1db0e0f6145980e4728e638372e0fd35af23')
|
'd82d0f15064812dcabb3456a7bcb1db0e0f6145980e4728e638372e0fd35af23'
|
||||||
|
'4520ebaa7ca5233478024e6aa57a6c9a0893967fed4461dff6f43035790a64d9')
|
||||||
|
|
||||||
prepare() {
|
prepare() {
|
||||||
cd ${_srcname}
|
cd ${_srcname}
|
||||||
|
# https://github.com/boostorg/phoenix/issues/111
|
||||||
|
patch -Np1 -i ../boost-1.81.0-phoenix-multiple-definitions.patch
|
||||||
|
|
||||||
# https://github.com/boostorg/ublas/pull/97
|
# https://github.com/boostorg/ublas/pull/97
|
||||||
patch -Np2 -i ../$_pkgname-ublas-c++20-iterator.patch
|
patch -Np2 -i ../$_pkgname-ublas-c++20-iterator.patch
|
||||||
|
|
||||||
patch -i ../no-versioned-shlibs.patch
|
patch -i ../no-versioned-shlibs.patch
|
||||||
|
patch -i ../disable-version-check.patch
|
||||||
}
|
}
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
|
|
|
@ -0,0 +1,11 @@
|
||||||
|
https://bugs.gentoo.org/887041
|
||||||
|
https://github.com/boostorg/phoenix/issues/111
|
||||||
|
--- a/boost/phoenix/stl.hpp
|
||||||
|
+++ b/boost/phoenix/stl.hpp
|
||||||
|
@@ -11,6 +11,5 @@
|
||||||
|
|
||||||
|
#include <boost/phoenix/stl/algorithm.hpp>
|
||||||
|
#include <boost/phoenix/stl/container.hpp>
|
||||||
|
-#include <boost/phoenix/stl/tuple.hpp>
|
||||||
|
|
||||||
|
#endif
|
|
@ -1,27 +1,33 @@
|
||||||
--- a/tools/build/src/tools/common.jam 2019-09-18 16:03:02.035995695 +0200
|
--- tools/build/src/tools/common.jam.orig 2023-02-03 10:57:59.385098144 +0100
|
||||||
+++ b/tools/build/src/tools/common.jam 2019-09-18 16:03:36.386156355 +0200
|
+++ tools/build/src/tools/common.jam 2023-02-03 11:00:34.982146918 +0100
|
||||||
@@ -974,16 +974,16 @@
|
@@ -1127,18 +1127,18 @@
|
||||||
|
import $(toolset) ;
|
||||||
|
local tool-version = [ $(toolset).get-full-version $(command) ] ;
|
||||||
|
|
||||||
|
- import version ;
|
||||||
|
- if ! [ version.version-compatible [ SPLIT_BY_CHARACTERS $(version) : . ]
|
||||||
|
- : [ SPLIT_BY_CHARACTERS $(tool-version) : . ] ]
|
||||||
|
- {
|
||||||
|
- errors.error toolset $(toolset) "initialization:"
|
||||||
|
- : version '$(version)' requested but
|
||||||
|
- '$(tool)-$(version)' not found and version
|
||||||
|
- '$(tool-version:J=.)' of default '$(command)'
|
||||||
|
- does not match
|
||||||
|
- : initialized from [ errors.nearest-user-location ]
|
||||||
|
- ;
|
||||||
|
- }
|
||||||
|
+ #import version ;
|
||||||
|
+ #if ! [ version.version-compatible [ SPLIT_BY_CHARACTERS $(version) : . ]
|
||||||
|
+ # : [ SPLIT_BY_CHARACTERS $(tool-version) : . ] ]
|
||||||
|
+ #{
|
||||||
|
+ # errors.error toolset $(toolset) "initialization:"
|
||||||
|
+ # : version '$(version)' requested but
|
||||||
|
+ # '$(tool)-$(version)' not found and version
|
||||||
|
+ # '$(tool-version:J=.)' of default '$(command)'
|
||||||
|
+ # does not match
|
||||||
|
+ # : initialized from [ errors.nearest-user-location ]
|
||||||
|
+ # ;
|
||||||
|
+ #}
|
||||||
}
|
}
|
||||||
|
#3) default: no command and no version specified, try using "$(tool)"
|
||||||
# From GCC 5, versioning changes and minor becomes patch
|
else
|
||||||
- if $(tag) = gcc && [ numbers.less 4 $(version[1]) ]
|
|
||||||
- {
|
|
||||||
- version = $(version[1]) ;
|
|
||||||
- }
|
|
||||||
+ #if $(tag) = gcc && [ numbers.less 4 $(version[1]) ]
|
|
||||||
+ #{
|
|
||||||
+ # version = $(version[1]) ;
|
|
||||||
+ #}
|
|
||||||
|
|
||||||
# Ditto, from Clang 4
|
|
||||||
- if ( $(tag) = clang || $(tag) = clangw ) && [ numbers.less 3 $(version[1]) ]
|
|
||||||
- {
|
|
||||||
- version = $(version[1]) ;
|
|
||||||
- }
|
|
||||||
+ #if ( $(tag) = clang || $(tag) = clangw ) && [ numbers.less 3 $(version[1]) ]
|
|
||||||
+ #{
|
|
||||||
+ # version = $(version[1]) ;
|
|
||||||
+ #}
|
|
||||||
|
|
||||||
# On intel, version is not added, because it does not matter and it is the
|
|
||||||
# version of vc used as backend that matters. Ideally, we should encode the
|
|
||||||
|
|
|
@ -16,7 +16,7 @@ _boost_arch=x86
|
||||||
_boost_address_model=64
|
_boost_address_model=64
|
||||||
|
|
||||||
pkgname=android-$_pkg_arch-$_pkgname
|
pkgname=android-$_pkg_arch-$_pkgname
|
||||||
pkgver=1.76.0
|
pkgver=1.81.0
|
||||||
_srcname=boost_${pkgver//./_}
|
_srcname=boost_${pkgver//./_}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
url='https://www.boost.org/'
|
url='https://www.boost.org/'
|
||||||
|
@ -29,18 +29,26 @@ makedepends=('bzip2' 'zlib' 'android-ndk' 'android-sdk')
|
||||||
conflicts=("android-$_pkgname-$_android_arch")
|
conflicts=("android-$_pkgname-$_android_arch")
|
||||||
replaces=("android-$_pkgname-$_android_arch")
|
replaces=("android-$_pkgname-$_android_arch")
|
||||||
source=(https://boostorg.jfrog.io/artifactory/main/release/$pkgver/source/$_srcname.tar.gz
|
source=(https://boostorg.jfrog.io/artifactory/main/release/$pkgver/source/$_srcname.tar.gz
|
||||||
|
boost-1.81.0-phoenix-multiple-definitions.patch
|
||||||
$_pkgname-ublas-c++20-iterator.patch::https://github.com/boostorg/ublas/commit/a31e5cffa85f.patch
|
$_pkgname-ublas-c++20-iterator.patch::https://github.com/boostorg/ublas/commit/a31e5cffa85f.patch
|
||||||
no-versioned-shlibs.patch)
|
no-versioned-shlibs.patch
|
||||||
sha256sums=('7bd7ddceec1a1dfdcbdb3e609b60d01739c38390a5f956385a12f3122049f0ca'
|
disable-version-check.patch)
|
||||||
|
sha256sums=('71feeed900fbccca04a3b4f2f84a7c217186f28a940ed8b7ed4725986baf99fa'
|
||||||
|
'3ebf428ef6be090a7b56a233330375539ac429333b83708e28fe5db049cfecdb'
|
||||||
'aa38addb40d5f44b4a8472029b475e7e6aef1c460509eb7d8edf03491dc1b5ee'
|
'aa38addb40d5f44b4a8472029b475e7e6aef1c460509eb7d8edf03491dc1b5ee'
|
||||||
'd82d0f15064812dcabb3456a7bcb1db0e0f6145980e4728e638372e0fd35af23')
|
'd82d0f15064812dcabb3456a7bcb1db0e0f6145980e4728e638372e0fd35af23'
|
||||||
|
'4520ebaa7ca5233478024e6aa57a6c9a0893967fed4461dff6f43035790a64d9')
|
||||||
|
|
||||||
prepare() {
|
prepare() {
|
||||||
cd ${_srcname}
|
cd ${_srcname}
|
||||||
|
# https://github.com/boostorg/phoenix/issues/111
|
||||||
|
patch -Np1 -i ../boost-1.81.0-phoenix-multiple-definitions.patch
|
||||||
|
|
||||||
# https://github.com/boostorg/ublas/pull/97
|
# https://github.com/boostorg/ublas/pull/97
|
||||||
patch -Np2 -i ../$_pkgname-ublas-c++20-iterator.patch
|
patch -Np2 -i ../$_pkgname-ublas-c++20-iterator.patch
|
||||||
|
|
||||||
patch -i ../no-versioned-shlibs.patch
|
patch -i ../no-versioned-shlibs.patch
|
||||||
|
patch -i ../disable-version-check.patch
|
||||||
}
|
}
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
|
|
|
@ -0,0 +1,11 @@
|
||||||
|
https://bugs.gentoo.org/887041
|
||||||
|
https://github.com/boostorg/phoenix/issues/111
|
||||||
|
--- a/boost/phoenix/stl.hpp
|
||||||
|
+++ b/boost/phoenix/stl.hpp
|
||||||
|
@@ -11,6 +11,5 @@
|
||||||
|
|
||||||
|
#include <boost/phoenix/stl/algorithm.hpp>
|
||||||
|
#include <boost/phoenix/stl/container.hpp>
|
||||||
|
-#include <boost/phoenix/stl/tuple.hpp>
|
||||||
|
|
||||||
|
#endif
|
|
@ -1,27 +1,33 @@
|
||||||
--- a/tools/build/src/tools/common.jam 2019-09-18 16:03:02.035995695 +0200
|
--- tools/build/src/tools/common.jam.orig 2023-02-03 10:57:59.385098144 +0100
|
||||||
+++ b/tools/build/src/tools/common.jam 2019-09-18 16:03:36.386156355 +0200
|
+++ tools/build/src/tools/common.jam 2023-02-03 11:00:34.982146918 +0100
|
||||||
@@ -974,16 +974,16 @@
|
@@ -1127,18 +1127,18 @@
|
||||||
|
import $(toolset) ;
|
||||||
|
local tool-version = [ $(toolset).get-full-version $(command) ] ;
|
||||||
|
|
||||||
|
- import version ;
|
||||||
|
- if ! [ version.version-compatible [ SPLIT_BY_CHARACTERS $(version) : . ]
|
||||||
|
- : [ SPLIT_BY_CHARACTERS $(tool-version) : . ] ]
|
||||||
|
- {
|
||||||
|
- errors.error toolset $(toolset) "initialization:"
|
||||||
|
- : version '$(version)' requested but
|
||||||
|
- '$(tool)-$(version)' not found and version
|
||||||
|
- '$(tool-version:J=.)' of default '$(command)'
|
||||||
|
- does not match
|
||||||
|
- : initialized from [ errors.nearest-user-location ]
|
||||||
|
- ;
|
||||||
|
- }
|
||||||
|
+ #import version ;
|
||||||
|
+ #if ! [ version.version-compatible [ SPLIT_BY_CHARACTERS $(version) : . ]
|
||||||
|
+ # : [ SPLIT_BY_CHARACTERS $(tool-version) : . ] ]
|
||||||
|
+ #{
|
||||||
|
+ # errors.error toolset $(toolset) "initialization:"
|
||||||
|
+ # : version '$(version)' requested but
|
||||||
|
+ # '$(tool)-$(version)' not found and version
|
||||||
|
+ # '$(tool-version:J=.)' of default '$(command)'
|
||||||
|
+ # does not match
|
||||||
|
+ # : initialized from [ errors.nearest-user-location ]
|
||||||
|
+ # ;
|
||||||
|
+ #}
|
||||||
}
|
}
|
||||||
|
#3) default: no command and no version specified, try using "$(tool)"
|
||||||
# From GCC 5, versioning changes and minor becomes patch
|
else
|
||||||
- if $(tag) = gcc && [ numbers.less 4 $(version[1]) ]
|
|
||||||
- {
|
|
||||||
- version = $(version[1]) ;
|
|
||||||
- }
|
|
||||||
+ #if $(tag) = gcc && [ numbers.less 4 $(version[1]) ]
|
|
||||||
+ #{
|
|
||||||
+ # version = $(version[1]) ;
|
|
||||||
+ #}
|
|
||||||
|
|
||||||
# Ditto, from Clang 4
|
|
||||||
- if ( $(tag) = clang || $(tag) = clangw ) && [ numbers.less 3 $(version[1]) ]
|
|
||||||
- {
|
|
||||||
- version = $(version[1]) ;
|
|
||||||
- }
|
|
||||||
+ #if ( $(tag) = clang || $(tag) = clangw ) && [ numbers.less 3 $(version[1]) ]
|
|
||||||
+ #{
|
|
||||||
+ # version = $(version[1]) ;
|
|
||||||
+ #}
|
|
||||||
|
|
||||||
# On intel, version is not added, because it does not matter and it is the
|
|
||||||
# version of vc used as backend that matters. Ideally, we should encode the
|
|
||||||
|
|
|
@ -16,7 +16,7 @@ _boost_arch=x86
|
||||||
_boost_address_model=32
|
_boost_address_model=32
|
||||||
|
|
||||||
pkgname=android-$_pkg_arch-$_pkgname
|
pkgname=android-$_pkg_arch-$_pkgname
|
||||||
pkgver=1.76.0
|
pkgver=1.81.0
|
||||||
_srcname=boost_${pkgver//./_}
|
_srcname=boost_${pkgver//./_}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
url='https://www.boost.org/'
|
url='https://www.boost.org/'
|
||||||
|
@ -29,18 +29,26 @@ makedepends=('bzip2' 'zlib' 'android-ndk' 'android-sdk')
|
||||||
conflicts=("android-$_pkgname-$_android_arch")
|
conflicts=("android-$_pkgname-$_android_arch")
|
||||||
replaces=("android-$_pkgname-$_android_arch")
|
replaces=("android-$_pkgname-$_android_arch")
|
||||||
source=(https://boostorg.jfrog.io/artifactory/main/release/$pkgver/source/$_srcname.tar.gz
|
source=(https://boostorg.jfrog.io/artifactory/main/release/$pkgver/source/$_srcname.tar.gz
|
||||||
|
boost-1.81.0-phoenix-multiple-definitions.patch
|
||||||
$_pkgname-ublas-c++20-iterator.patch::https://github.com/boostorg/ublas/commit/a31e5cffa85f.patch
|
$_pkgname-ublas-c++20-iterator.patch::https://github.com/boostorg/ublas/commit/a31e5cffa85f.patch
|
||||||
no-versioned-shlibs.patch)
|
no-versioned-shlibs.patch
|
||||||
sha256sums=('7bd7ddceec1a1dfdcbdb3e609b60d01739c38390a5f956385a12f3122049f0ca'
|
disable-version-check.patch)
|
||||||
|
sha256sums=('71feeed900fbccca04a3b4f2f84a7c217186f28a940ed8b7ed4725986baf99fa'
|
||||||
|
'3ebf428ef6be090a7b56a233330375539ac429333b83708e28fe5db049cfecdb'
|
||||||
'aa38addb40d5f44b4a8472029b475e7e6aef1c460509eb7d8edf03491dc1b5ee'
|
'aa38addb40d5f44b4a8472029b475e7e6aef1c460509eb7d8edf03491dc1b5ee'
|
||||||
'd82d0f15064812dcabb3456a7bcb1db0e0f6145980e4728e638372e0fd35af23')
|
'd82d0f15064812dcabb3456a7bcb1db0e0f6145980e4728e638372e0fd35af23'
|
||||||
|
'4520ebaa7ca5233478024e6aa57a6c9a0893967fed4461dff6f43035790a64d9')
|
||||||
|
|
||||||
prepare() {
|
prepare() {
|
||||||
cd ${_srcname}
|
cd ${_srcname}
|
||||||
|
# https://github.com/boostorg/phoenix/issues/111
|
||||||
|
patch -Np1 -i ../boost-1.81.0-phoenix-multiple-definitions.patch
|
||||||
|
|
||||||
# https://github.com/boostorg/ublas/pull/97
|
# https://github.com/boostorg/ublas/pull/97
|
||||||
patch -Np2 -i ../$_pkgname-ublas-c++20-iterator.patch
|
patch -Np2 -i ../$_pkgname-ublas-c++20-iterator.patch
|
||||||
|
|
||||||
patch -i ../no-versioned-shlibs.patch
|
patch -i ../no-versioned-shlibs.patch
|
||||||
|
patch -i ../disable-version-check.patch
|
||||||
}
|
}
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
|
|
|
@ -0,0 +1,11 @@
|
||||||
|
https://bugs.gentoo.org/887041
|
||||||
|
https://github.com/boostorg/phoenix/issues/111
|
||||||
|
--- a/boost/phoenix/stl.hpp
|
||||||
|
+++ b/boost/phoenix/stl.hpp
|
||||||
|
@@ -11,6 +11,5 @@
|
||||||
|
|
||||||
|
#include <boost/phoenix/stl/algorithm.hpp>
|
||||||
|
#include <boost/phoenix/stl/container.hpp>
|
||||||
|
-#include <boost/phoenix/stl/tuple.hpp>
|
||||||
|
|
||||||
|
#endif
|
|
@ -1,27 +1,33 @@
|
||||||
--- a/tools/build/src/tools/common.jam 2019-09-18 16:03:02.035995695 +0200
|
--- tools/build/src/tools/common.jam.orig 2023-02-03 10:57:59.385098144 +0100
|
||||||
+++ b/tools/build/src/tools/common.jam 2019-09-18 16:03:36.386156355 +0200
|
+++ tools/build/src/tools/common.jam 2023-02-03 11:00:34.982146918 +0100
|
||||||
@@ -974,16 +974,16 @@
|
@@ -1127,18 +1127,18 @@
|
||||||
|
import $(toolset) ;
|
||||||
|
local tool-version = [ $(toolset).get-full-version $(command) ] ;
|
||||||
|
|
||||||
|
- import version ;
|
||||||
|
- if ! [ version.version-compatible [ SPLIT_BY_CHARACTERS $(version) : . ]
|
||||||
|
- : [ SPLIT_BY_CHARACTERS $(tool-version) : . ] ]
|
||||||
|
- {
|
||||||
|
- errors.error toolset $(toolset) "initialization:"
|
||||||
|
- : version '$(version)' requested but
|
||||||
|
- '$(tool)-$(version)' not found and version
|
||||||
|
- '$(tool-version:J=.)' of default '$(command)'
|
||||||
|
- does not match
|
||||||
|
- : initialized from [ errors.nearest-user-location ]
|
||||||
|
- ;
|
||||||
|
- }
|
||||||
|
+ #import version ;
|
||||||
|
+ #if ! [ version.version-compatible [ SPLIT_BY_CHARACTERS $(version) : . ]
|
||||||
|
+ # : [ SPLIT_BY_CHARACTERS $(tool-version) : . ] ]
|
||||||
|
+ #{
|
||||||
|
+ # errors.error toolset $(toolset) "initialization:"
|
||||||
|
+ # : version '$(version)' requested but
|
||||||
|
+ # '$(tool)-$(version)' not found and version
|
||||||
|
+ # '$(tool-version:J=.)' of default '$(command)'
|
||||||
|
+ # does not match
|
||||||
|
+ # : initialized from [ errors.nearest-user-location ]
|
||||||
|
+ # ;
|
||||||
|
+ #}
|
||||||
}
|
}
|
||||||
|
#3) default: no command and no version specified, try using "$(tool)"
|
||||||
# From GCC 5, versioning changes and minor becomes patch
|
else
|
||||||
- if $(tag) = gcc && [ numbers.less 4 $(version[1]) ]
|
|
||||||
- {
|
|
||||||
- version = $(version[1]) ;
|
|
||||||
- }
|
|
||||||
+ #if $(tag) = gcc && [ numbers.less 4 $(version[1]) ]
|
|
||||||
+ #{
|
|
||||||
+ # version = $(version[1]) ;
|
|
||||||
+ #}
|
|
||||||
|
|
||||||
# Ditto, from Clang 4
|
|
||||||
- if ( $(tag) = clang || $(tag) = clangw ) && [ numbers.less 3 $(version[1]) ]
|
|
||||||
- {
|
|
||||||
- version = $(version[1]) ;
|
|
||||||
- }
|
|
||||||
+ #if ( $(tag) = clang || $(tag) = clangw ) && [ numbers.less 3 $(version[1]) ]
|
|
||||||
+ #{
|
|
||||||
+ # version = $(version[1]) ;
|
|
||||||
+ #}
|
|
||||||
|
|
||||||
# On intel, version is not added, because it does not matter and it is the
|
|
||||||
# version of vc used as backend that matters. Ideally, we should encode the
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
_pkgbase=boost
|
_pkgbase=boost
|
||||||
pkgname=boost-doc
|
pkgname=boost-doc
|
||||||
pkgver=1.80.0
|
pkgver=1.81.0
|
||||||
_srcname=boost_${pkgver//./_}
|
_srcname=boost_${pkgver//./_}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
pkgdesc='Free peer-reviewed portable C++ source libraries (HTML documentation)'
|
pkgdesc='Free peer-reviewed portable C++ source libraries (HTML documentation)'
|
||||||
|
@ -9,7 +9,7 @@ arch=('x86_64')
|
||||||
license=('custom')
|
license=('custom')
|
||||||
makedepends=()
|
makedepends=()
|
||||||
source=(https://boostorg.jfrog.io/artifactory/main/release/$pkgver/source/$_srcname.tar.bz2)
|
source=(https://boostorg.jfrog.io/artifactory/main/release/$pkgver/source/$_srcname.tar.bz2)
|
||||||
sha256sums=('1e19565d82e43bc59209a168f5ac899d3ba471d55c7610c677d4ccf2c9c500c0')
|
sha256sums=('71feeed900fbccca04a3b4f2f84a7c217186f28a940ed8b7ed4725986baf99fa')
|
||||||
options=(!strip)
|
options=(!strip)
|
||||||
|
|
||||||
package() {
|
package() {
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
|
|
||||||
_pkgname=boost
|
_pkgname=boost
|
||||||
pkgname=static-compat-$_pkgname
|
pkgname=static-compat-$_pkgname
|
||||||
pkgver=1.80.0
|
pkgver=1.81.0
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
_srcname=boost_${pkgver//./_}
|
_srcname=boost_${pkgver//./_}
|
||||||
pkgdesc="Free peer-reviewed portable C++ source libraries"
|
pkgdesc="Free peer-reviewed portable C++ source libraries"
|
||||||
|
@ -22,13 +22,18 @@ options=('staticlibs')
|
||||||
depends=('static-compat-zlib' 'static-compat-zstd' 'static-compat-bzip2')
|
depends=('static-compat-zlib' 'static-compat-zstd' 'static-compat-bzip2')
|
||||||
makedepends=('static-compat-environment')
|
makedepends=('static-compat-environment')
|
||||||
source=(https://boostorg.jfrog.io/artifactory/main/release/$pkgver/source/$_srcname.tar.bz2
|
source=(https://boostorg.jfrog.io/artifactory/main/release/$pkgver/source/$_srcname.tar.bz2
|
||||||
|
boost-1.81.0-phoenix-multiple-definitions.patch
|
||||||
$_pkgname-ublas-c++20-iterator.patch::https://github.com/boostorg/ublas/commit/a31e5cffa85f.patch)
|
$_pkgname-ublas-c++20-iterator.patch::https://github.com/boostorg/ublas/commit/a31e5cffa85f.patch)
|
||||||
sha256sums=('1e19565d82e43bc59209a168f5ac899d3ba471d55c7610c677d4ccf2c9c500c0'
|
sha256sums=('71feeed900fbccca04a3b4f2f84a7c217186f28a940ed8b7ed4725986baf99fa'
|
||||||
|
'3ebf428ef6be090a7b56a233330375539ac429333b83708e28fe5db049cfecdb'
|
||||||
'aa38addb40d5f44b4a8472029b475e7e6aef1c460509eb7d8edf03491dc1b5ee')
|
'aa38addb40d5f44b4a8472029b475e7e6aef1c460509eb7d8edf03491dc1b5ee')
|
||||||
|
|
||||||
prepare() {
|
prepare() {
|
||||||
cd $_srcname
|
cd $_srcname
|
||||||
|
|
||||||
|
# https://github.com/boostorg/phoenix/issues/111
|
||||||
|
patch -Np1 -i ../boost-1.81.0-phoenix-multiple-definitions.patch
|
||||||
|
|
||||||
# https://github.com/boostorg/ublas/pull/97
|
# https://github.com/boostorg/ublas/pull/97
|
||||||
patch -Np2 -i ../$_pkgname-ublas-c++20-iterator.patch
|
patch -Np2 -i ../$_pkgname-ublas-c++20-iterator.patch
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
../android-aarch64/boost-1.81.0-phoenix-multiple-definitions.patch
|
Loading…
Reference in New Issue