Skip to content

Commit

Permalink
boost: Update to 1.66.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Alexpux committed Dec 22, 2017
1 parent d95939a commit 6518b67
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 41 deletions.
10 changes: 5 additions & 5 deletions mingw-w64-boost/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
_realname=boost
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=1.64.0
pkgver=1.66.0
_boostver=${pkgver//./_}
pkgrel=3
pkgrel=1
pkgdesc="Free peer-reviewed portable C++ source libraries (mingw-w64)"
arch=('any')
url="https://www.boost.org/"
Expand Down Expand Up @@ -35,18 +35,18 @@ source=(https://downloads.sourceforge.net/sourceforge/boost/boost_${_boostver}.t
boost-include-intrin-h-on-mingw-w64.patch
using-mingw-w64-python.patch
msys2-mingw-folders-bootstrap.patch)
sha256sums=('7bcc5caace97baa948931d712ea5f37038dbb1c5d89b43ad4def4ed7cb683332'
sha256sums=('5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9'
'c5eae6354693c6b4e6364d4cf6f06c6c3de4c28486bf812cbd291f4410126cf8'
'f32d189cc661e9b843cf0a3c1528de41aaf4f1ea69d6150b5bcd0a2525d36424'
'4551ba9edf64c8ccdab4f4890c20e2e8cf6d4ffa1169d251df11e30d25b886b8'
'b22196b6415f5e1c0fe56b49a12ea7c20073b15a5f31907f363c7be38d70d628'
'a9a95bdc25a1449c542c667c95bd128ca8a19c0f6282c53671137b2d1b74b0f4'
'bb83d991f900a1cfd6a5aa874cbc33f76f3d6ce6388fd996886fdabe79b1f74c'
'd4be505bf6cd08b9da232d0311bfda2820dd75cf8911ed07b72eddc418c73614'
'b15743957aa1c7eb1e861dfe96247e50b7afd96258d960be403851ce62923c87'
'cf46e9b791b45937d5af26b0f35dcdfa416cd9b62ef6c29e3064464835634628'
'01758929643f92530512230d37df9793e6481cd6ce6310e3a79cee5ba287858c'
'6182b9cf28e069920a5e7bf9b7d4155df196fc6ee6a31385aaf17c36a91d55c7'
'8bc4cc4b6cc704c55929860039106d9564c67d42686d01a5c59e25e958eb4b95'
'9ac0fc0306114d709958ae6e17fdd38616fa7c352d10346f099b51ef49d0ec4e'
'2d5a82277f271612421f05c3b1a1e55fe736a18b581920eea12b54767d74edad'
'bbfa002a78d5fdd503b5b97cdc0e367f8e145f514079d95bfd6318fcffefbda4'
'9a269375b8eb262b93fb18ea6b2ac8c97b16fb71b8bab900faa4c2df2816f2eb'
Expand Down
40 changes: 20 additions & 20 deletions mingw-w64-boost/boost-1.57.0-build-optflags.patch
Original file line number Diff line number Diff line change
@@ -1,8 +1,26 @@
diff -up ./tools/build/src/tools/gcc.jam~ ./tools/build/src/tools/gcc.jam
--- ./tools/build/src/tools/gcc.jam~ 2015-02-09 15:01:04.850331626 +0100
+++ ./tools/build/src/tools/gcc.jam 2015-02-09 15:44:29.122307134 +0100
@@ -366,17 +366,17 @@ generators.override gcc.compile.c++.pch
toolset.flags gcc.compile PCH_FILE <pch>on : <pch-file> ;
@@ -603,7 +603,7 @@ rule compile.fortran ( targets * : sourc

actions compile.c++ bind PCH_FILE
{
- "$(CONFIG_COMMAND)" $(LANG) -ftemplate-depth-$(TEMPLATE_DEPTH) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(PCH_FILE:D)" -I"$(INCLUDES)" -c -o "$(<:W)" "$(>:W)"
+ "$(CONFIG_COMMAND)" $(LANG) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(PCH_FILE:D)" -I"$(INCLUDES)" -c -o "$(<:W)" "$(>:W)"
}

actions compile.c bind PCH_FILE
@@ -613,7 +613,7 @@ actions compile.c bind PCH_FILE

actions compile.c++.preprocess bind PCH_FILE
{
- "$(CONFIG_COMMAND)" $(LANG) -ftemplate-depth-$(TEMPLATE_DEPTH) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(PCH_FILE:D)" -I"$(INCLUDES)" "$(>:W)" -E >"$(<:W)"
+ "$(CONFIG_COMMAND)" $(LANG) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(PCH_FILE:D)" -I"$(INCLUDES)" "$(>:W)" -E >"$(<:W)"
}

actions compile.c.preprocess bind PCH_FILE
@@ -755,17 +755,17 @@ generators.override gcc.compile.c++.pch
###

# Declare flags and action for compilation.
-toolset.flags gcc.compile OPTIONS <optimization>off : -O0 ;
Expand All @@ -28,21 +46,3 @@ diff -up ./tools/build/src/tools/gcc.jam~ ./tools/build/src/tools/gcc.jam
toolset.flags gcc.compile OPTIONS <warnings-as-errors>on : -Werror ;

toolset.flags gcc.compile OPTIONS <debug-symbols>on : -g ;
@@ -603,7 +603,7 @@ rule compile.fortran ( targets * : sourc

actions compile.c++ bind PCH_FILE
{
- "$(CONFIG_COMMAND)" $(LANG) -ftemplate-depth-$(TEMPLATE_DEPTH) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(PCH_FILE:D)" -I"$(INCLUDES)" -c -o "$(<:W)" "$(>:W)"
+ "$(CONFIG_COMMAND)" $(LANG) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(PCH_FILE:D)" -I"$(INCLUDES)" -c -o "$(<:W)" "$(>:W)"
}

actions compile.c bind PCH_FILE
@@ -613,7 +613,7 @@ actions compile.c bind PCH_FILE

actions compile.c++.preprocess bind PCH_FILE
{
- "$(CONFIG_COMMAND)" $(LANG) -ftemplate-depth-$(TEMPLATE_DEPTH) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(PCH_FILE:D)" -I"$(INCLUDES)" "$(>:W)" -E >"$(<:W)"
+ "$(CONFIG_COMMAND)" $(LANG) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(PCH_FILE:D)" -I"$(INCLUDES)" "$(>:W)" -E >"$(<:W)"
}

actions compile.c.preprocess bind PCH_FILE
17 changes: 1 addition & 16 deletions mingw-w64-boost/boost-1.60.0-mingw-context.patch
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ Subject: [PATCH] boost::context segfault fix on x86_64/Windows

---
libs/context/build/Jamfile.v2 | 18 ++++++++++--------
libs/thread/build/Jamfile.v2 | 3 ++-
2 files changed, 12 insertions(+), 9 deletions(-)
1 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/libs/context/build/Jamfile.v2 b/libs/context/build/Jamfile.v2
index 63c6984..cba6dce 100644
Expand Down Expand Up @@ -44,20 +43,6 @@ index 63c6984..cba6dce 100644
return $(tmp) ;
}

diff --git a/libs/thread/build/Jamfile.v2 b/libs/thread/build/Jamfile.v2
index 6a46030..394c04a 100644
--- a/libs/thread/build/Jamfile.v2
+++ b/libs/thread/build/Jamfile.v2
@@ -142,7 +142,8 @@ project boost/thread
local rule default_threadapi ( )
{
local api = pthread ;
- if [ os.name ] = "NT" { api = win32 ; }
+ #if [ os.name ] = "NT" { api = win32 ; }
+ api = win32 ;
return $(api) ;
}

--
1.9.1

0 comments on commit 6518b67

Please sign in to comment.