summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO11
-rw-r--r--PKGBUILD28
-rw-r--r--context-cross.patch38
-rw-r--r--stacktrace-cross.patch12
4 files changed, 9 insertions, 80 deletions
diff --git a/.SRCINFO b/.SRCINFO
index fd3d616d8104..fa784979db4e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = mingw-w64-boost
pkgdesc = Free peer-reviewed portable C++ source libraries (mingw-w64)
- pkgver = 1.81.0
+ pkgver = 1.83.0
pkgrel = 1
url = http://www.boost.org/
arch = any
@@ -9,15 +9,10 @@ pkgbase = mingw-w64-boost
makedepends = mingw-w64-wine
depends = mingw-w64-zstd
depends = mingw-w64-bzip2
- depends = mingw-w64-libbacktrace-git
options = !strip
options = !buildflags
options = staticlibs
- source = https://boostorg.jfrog.io/artifactory/main/release/1.81.0/source/boost_1_81_0.tar.bz2
- source = context-cross.patch
- source = stacktrace-cross.patch
- sha256sums = 71feeed900fbccca04a3b4f2f84a7c217186f28a940ed8b7ed4725986baf99fa
- sha256sums = 844e163845ea6e7ae1f8d26cb52f72c6e4645cdade1be081bc1d2cff5db0a918
- sha256sums = 333791abd17ea192e0aa90185bfb8938e8e3dc102b284db316b061b2067e2fc2
+ source = https://boostorg.jfrog.io/artifactory/main/release/1.83.0/source/boost_1_83_0.tar.bz2
+ sha256sums = 6478edfe2f3305127cffe8caf73ea0176c53769f4bf1585be237eb30798c3b8e
pkgname = mingw-w64-boost
diff --git a/PKGBUILD b/PKGBUILD
index d0c5053db489..0bf2a0a8ad1c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,40 +1,24 @@
pkgname=mingw-w64-boost
-pkgver=1.81.0
+pkgver=1.83.0
_boostver=${pkgver//./_}
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-libbacktrace-git')
+depends=('mingw-w64-zstd' 'mingw-w64-bzip2')
makedepends=('mingw-w64-gcc' 'mingw-w64-wine')
options=('!strip' '!buildflags' 'staticlibs')
-source=("https://boostorg.jfrog.io/artifactory/main/release/${pkgver}/source/boost_${_boostver}.tar.bz2"
- "context-cross.patch" "stacktrace-cross.patch")
-sha256sums=('71feeed900fbccca04a3b4f2f84a7c217186f28a940ed8b7ed4725986baf99fa'
- '844e163845ea6e7ae1f8d26cb52f72c6e4645cdade1be081bc1d2cff5db0a918'
- '333791abd17ea192e0aa90185bfb8938e8e3dc102b284db316b061b2067e2fc2')
+source=("https://boostorg.jfrog.io/artifactory/main/release/${pkgver}/source/boost_${_boostver}.tar.bz2")
+sha256sums=('6478edfe2f3305127cffe8caf73ea0176c53769f4bf1585be237eb30798c3b8e')
_architectures="32:i686-w64-mingw32 64:x86_64-w64-mingw32"
-
prepare() {
- cd "${srcdir}/boost_${_boostver}"
-
- # https://svn.boost.org/trac/boost/ticket/7262
- patch -p1 -d libs/context -i "${srcdir}"/context-cross.patch
-
- # bypass libbacktrace detection
- patch -p1 -d libs/stacktrace -i "${srcdir}"/stacktrace-cross.patch
-
- # sys/mman.h
- curl -L https://github.com/boostorg/context/pull/217.patch | patch -p2
-
- cd "${srcdir}"
for _arch in ${_architectures}; do
rm -rf build-${_arch:3}
cp -r boost_${_boostver} build-${_arch:3}
- pushd build-${_arch:3}
+ pushd build-${_arch:3}
cat > user-config.jam << EOF
using gcc : mingw64 : ${_arch:3}-g++
@@ -67,6 +51,7 @@ package() {
address-model=${_arch:0:2} \
architecture=x86 \
binary-format=pe \
+ abi=ms \
-l0 ${MAKEFLAGS} \
--layout=system install
install -d $pkgdir/usr/${_arch:3}/bin
@@ -76,4 +61,3 @@ package() {
popd
done
}
-
diff --git a/context-cross.patch b/context-cross.patch
deleted file mode 100644
index c14591af804d..000000000000
--- a/context-cross.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git a/build/Jamfile.v2 b/build/Jamfile.v2
-index 580aca6..572148f 100644
---- a/build/Jamfile.v2
-+++ b/build/Jamfile.v2
-@@ -52,10 +52,11 @@ project boost/context
- local rule default_binary_format ( )
- {
- local tmp = elf ;
-- if [ os.name ] = "NT" { tmp = pe ; }
-- else if [ os.name ] = "CYGWIN" { tmp = pe ; }
-- else if [ os.name ] = "AIX" { tmp = xcoff ; }
-- else if [ os.name ] = "MACOSX" { tmp = mach-o ; }
-+ #if [ os.name ] = "NT" { tmp = pe ; }
-+ #else if [ os.name ] = "CYGWIN" { tmp = pe ; }
-+ #else if [ os.name ] = "AIX" { tmp = xcoff ; }
-+ #else if [ os.name ] = "MACOSX" { tmp = mach-o ; }
-+ tmp = pe ;
- return $(tmp) ;
- }
-
-@@ -72,11 +73,12 @@ feature.set-default binary-format : [ default_binary_format ] ;
- local rule default_abi ( )
- {
- local tmp = sysv ;
-- if [ os.name ] = "NT" { tmp = ms ; }
-- else if [ os.name ] = "CYGWIN" { tmp = ms ; }
-- else if [ os.platform ] = "ARM" { tmp = aapcs ; }
-- else if [ os.platform ] = "MIPS32" { tmp = o32 ; }
-- else if [ os.platform ] = "MIPS64" { tmp = n64 ; }
-+ #if [ os.name ] = "NT" { tmp = ms ; }
-+ #else if [ os.name ] = "CYGWIN" { tmp = ms ; }
-+ #else if [ os.platform ] = "ARM" { tmp = aapcs ; }
-+ #else if [ os.platform ] = "MIPS32" { tmp = o32 ; }
-+ #else if [ os.platform ] = "MIPS64" { tmp = n64 ; }
-+ tmp = ms ;
- return $(tmp) ;
- }
-
diff --git a/stacktrace-cross.patch b/stacktrace-cross.patch
deleted file mode 100644
index e8b9628f1426..000000000000
--- a/stacktrace-cross.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/build/Jamfile.v2 b/build/Jamfile.v2
-index 6d6d85a..c5ee926 100644
---- a/build/Jamfile.v2
-+++ b/build/Jamfile.v2
-@@ -74,7 +74,6 @@ lib boost_stacktrace_backtrace
- <target-os>linux:<library>dl
- <library>backtrace
- <link>shared:<define>BOOST_STACKTRACE_DYN_LINK=1
-- [ check-target-builds ../build//libbacktrace : : <build>no ]
- : # default build
- : # usage-requirements
- #<link>shared:<define>BOOST_STACKTRACE_DYN_LINK=1