summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
diff options
context:
space:
mode:
authorMingli Yu <mingli.yu@windriver.com>2018-04-26 23:05:32 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-05-04 13:28:05 +0100
commitd336110b9409d4a8c329d99e18cf23059048741c (patch)
treec64734c4d7bc9d0d67c6469fe11ef1562e579489 /meta/recipes-support
parentad2a0b2ef11cabdbd03c39259c69c0513a323995 (diff)
downloadpoky-d336110b9409d4a8c329d99e18cf23059048741c.tar.gz
boost: update to 1.67.0
* Remove the backported patch 0001-Fix-a-strange-assert-typo-how-was-this-released-with.patch * Remove the patch 0002-Don-t-set-up-m32-m64-we-do-that-ourselves.patch as it already rewritten gcc to use toolset.flags again as below: commit 12decb3ce680031b915f69902795eec47224fc7d Author: Steven Watanabe <steven@providere-consulting.com> Date: Mon Jan 1 12:51:43 2018 -0700 Rewrite gcc to use toolset.flags again. * Remove the hardcoded parallel build limit as the mechanism already changed as below commit: commit 316e26ca718afc65d6170029284521392524e4f8 Author: Steven Watanabe <steven@providere-consulting.com> Date: Wed Apr 26 14:22:06 2017 -0600 Remove fixed limit to -j. Fixes #189. * execunix.c: Replace select with poll. * execnt.c: Use RegisterWaitForSingleObject when the number of jobs exceeds MAXIMUM_WAIT_OBJECTS. Reference: https://github.com/boostorg/build/commit/316e26ca718afc65d6170029284521392524e4f8#diff-c88fe8afebc632d0bef2bd5985137af2 (From OE-Core rev: 358cf46ea4d01b7ad8c355fa103d4a6922cc0a88) Signed-off-by: Mingli Yu <mingli.yu@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r--meta/recipes-support/boost/bjam-native_1.67.0.bb (renamed from meta/recipes-support/boost/bjam-native_1.66.0.bb)2
-rw-r--r--meta/recipes-support/boost/boost-1.67.0.inc (renamed from meta/recipes-support/boost/boost-1.66.0.inc)4
-rw-r--r--meta/recipes-support/boost/boost.inc5
-rw-r--r--meta/recipes-support/boost/boost/0002-Don-t-set-up-m32-m64-we-do-that-ourselves.patch65
-rw-r--r--meta/recipes-support/boost/boost_1.67.0.bb (renamed from meta/recipes-support/boost/boost_1.66.0.bb)1
-rw-r--r--meta/recipes-support/boost/files/0001-Fix-a-strange-assert-typo-how-was-this-released-with.patch37
6 files changed, 5 insertions, 109 deletions
diff --git a/meta/recipes-support/boost/bjam-native_1.66.0.bb b/meta/recipes-support/boost/bjam-native_1.67.0.bb
index 92c86a3ef5..94f96e62d8 100644
--- a/meta/recipes-support/boost/bjam-native_1.66.0.bb
+++ b/meta/recipes-support/boost/bjam-native_1.67.0.bb
@@ -6,7 +6,7 @@ SECTION = "devel"
6inherit native 6inherit native
7 7
8SRC_URI += "file://bjam-native-build-bjam.debug.patch \ 8SRC_URI += "file://bjam-native-build-bjam.debug.patch \
9 file://0001-Fix-a-strange-assert-typo-how-was-this-released-with.patch" 9"
10 10
11do_compile() { 11do_compile() {
12 ./bootstrap.sh --with-toolset=gcc 12 ./bootstrap.sh --with-toolset=gcc
diff --git a/meta/recipes-support/boost/boost-1.66.0.inc b/meta/recipes-support/boost/boost-1.67.0.inc
index fe2b8639f7..1c7f94022d 100644
--- a/meta/recipes-support/boost/boost-1.66.0.inc
+++ b/meta/recipes-support/boost/boost-1.67.0.inc
@@ -12,8 +12,8 @@ BOOST_MAJ = "${@"_".join(d.getVar("PV").split(".")[0:2])}"
12BOOST_P = "boost_${BOOST_VER}" 12BOOST_P = "boost_${BOOST_VER}"
13 13
14SRC_URI = "${SOURCEFORGE_MIRROR}/project/boost/boost/${PV}/${BOOST_P}.tar.bz2" 14SRC_URI = "${SOURCEFORGE_MIRROR}/project/boost/boost/${PV}/${BOOST_P}.tar.bz2"
15SRC_URI[md5sum] = "b2dfbd6c717be4a7bb2d88018eaccf75" 15SRC_URI[md5sum] = "ced776cb19428ab8488774e1415535ab"
16SRC_URI[sha256sum] = "5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9" 16SRC_URI[sha256sum] = "2684c972994ee57fc5632e03bf044746f6eb45d4920c343937a465fd67a5adba"
17 17
18UPSTREAM_CHECK_URI = "http://www.boost.org/users/download/" 18UPSTREAM_CHECK_URI = "http://www.boost.org/users/download/"
19UPSTREAM_CHECK_REGEX = "boostorg/release/(?P<pver>.*)/source/" 19UPSTREAM_CHECK_REGEX = "boostorg/release/(?P<pver>.*)/source/"
diff --git a/meta/recipes-support/boost/boost.inc b/meta/recipes-support/boost/boost.inc
index 0461ec6fcf..b447897a0c 100644
--- a/meta/recipes-support/boost/boost.inc
+++ b/meta/recipes-support/boost/boost.inc
@@ -133,9 +133,8 @@ BJAM_TOOLS = "--ignore-site-config \
133 '--layout=system' \ 133 '--layout=system' \
134 " 134 "
135 135
136# use PARALLEL_MAKE to speed up the build, but limit it by -j 64, greater parallelism causes bjam to segfault or to ignore -j 136# use PARALLEL_MAKE to speed up the build
137# https://svn.boost.org/trac/boost/ticket/7634 137BOOST_PARALLEL_MAKE = "${@oe.utils.parallel_make_argument(d, '-j%d')}"
138BOOST_PARALLEL_MAKE = "${@oe.utils.parallel_make_argument(d, '-j%d', limit=64)}"
139BJAM_OPTS = '${BOOST_PARALLEL_MAKE} -d+2 -q \ 138BJAM_OPTS = '${BOOST_PARALLEL_MAKE} -d+2 -q \
140 ${BJAM_TOOLS} \ 139 ${BJAM_TOOLS} \
141 -sBOOST_BUILD_USER_CONFIG=${WORKDIR}/user-config.jam \ 140 -sBOOST_BUILD_USER_CONFIG=${WORKDIR}/user-config.jam \
diff --git a/meta/recipes-support/boost/boost/0002-Don-t-set-up-m32-m64-we-do-that-ourselves.patch b/meta/recipes-support/boost/boost/0002-Don-t-set-up-m32-m64-we-do-that-ourselves.patch
deleted file mode 100644
index 26f3cbb051..0000000000
--- a/meta/recipes-support/boost/boost/0002-Don-t-set-up-m32-m64-we-do-that-ourselves.patch
+++ /dev/null
@@ -1,65 +0,0 @@
1From e4d3a7470b307693660d0412732e7266d1738d8c Mon Sep 17 00:00:00 2001
2From: Christopher Larson <chris_larson@mentor.com>
3Date: Tue, 13 Dec 2016 10:29:17 -0700
4Subject: [PATCH 6/6] Don't set up -m32/-m64, we do that ourselves
5
6Upstream-Status: Inappropriate
7Signed-off-by: Christopher Larson <chris_larson@mentor.com>
8
9---
10 tools/build/src/tools/gcc.jam | 39 ---------------------------------------
11 1 file changed, 39 deletions(-)
12
13diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam
14index e4fc6c32..37914fd0 100644
15--- a/tools/build/src/tools/gcc.jam
16+++ b/tools/build/src/tools/gcc.jam
17@@ -337,45 +337,6 @@ rule set-address-model-options ( targets * : sources * : properties * )
18 {
19 local option ;
20 local target-os = [ feature.get-values target-os : $(properties) ] ;
21- if $(target-os) = aix
22- {
23- if $(model) = 32
24- {
25- option = -maix32 ;
26- }
27- else
28- {
29- option = -maix64 ;
30- }
31- }
32- else if $(target-os) = hpux
33- {
34- if $(model) = 32
35- {
36- option = -milp32 ;
37- }
38- else
39- {
40- option = -mlp64 ;
41- }
42- }
43- else
44- {
45- local arch = [ feature.get-values architecture : $(properties) ] ;
46- if $(arch) = power || $(arch) = sparc || $(arch) = x86
47- {
48- if $(model) = 32
49- {
50- option = -m32 ;
51- }
52- else if $(model) = 64
53- {
54- option = -m64 ;
55- }
56- }
57- # For darwin, the model can be 32_64. darwin.jam will handle that
58- # on its own.
59- }
60 OPTIONS on $(targets) += $(option) ;
61 }
62 }
63--
642.15.1
65
diff --git a/meta/recipes-support/boost/boost_1.66.0.bb b/meta/recipes-support/boost/boost_1.67.0.bb
index 63b82a5995..eb50899d56 100644
--- a/meta/recipes-support/boost/boost_1.66.0.bb
+++ b/meta/recipes-support/boost/boost_1.67.0.bb
@@ -7,5 +7,4 @@ SRC_URI += "\
7 file://boost-math-disable-pch-for-gcc.patch \ 7 file://boost-math-disable-pch-for-gcc.patch \
8 file://0001-Apply-boost-1.62.0-no-forced-flags.patch.patch \ 8 file://0001-Apply-boost-1.62.0-no-forced-flags.patch.patch \
9 file://0003-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch \ 9 file://0003-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch \
10 file://0002-Don-t-set-up-m32-m64-we-do-that-ourselves.patch \
11" 10"
diff --git a/meta/recipes-support/boost/files/0001-Fix-a-strange-assert-typo-how-was-this-released-with.patch b/meta/recipes-support/boost/files/0001-Fix-a-strange-assert-typo-how-was-this-released-with.patch
deleted file mode 100644
index a75133d2bc..0000000000
--- a/meta/recipes-support/boost/files/0001-Fix-a-strange-assert-typo-how-was-this-released-with.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1From 5685527364198597f25fc1c6236cb64cbc3de44f Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Wed, 4 Oct 2017 18:16:08 +0300
4Subject: [PATCH] Fix a strange assert typo; how was this released without
5 noticing?
6
7Upstream-Status: Pending
8Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
9---
10 tools/build/src/engine/debugger.c | 4 ++--
11 1 file changed, 2 insertions(+), 2 deletions(-)
12
13diff --git a/tools/build/src/engine/debugger.c b/tools/build/src/engine/debugger.c
14index 802f262..152a7e6 100644
15--- a/tools/build/src/engine/debugger.c
16+++ b/tools/build/src/engine/debugger.c
17@@ -1092,7 +1092,7 @@ static void debug_start_child( int argc, const char * * argv )
18 PROCESS_INFORMATION pi = { NULL, NULL, 0, 0 };
19 STARTUPINFO si = { sizeof( STARTUPINFO ), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
20 0, 0, 0, 0, 0, 0 };
21- assert( DEBUG_STATE == DEBUG_NO_CHILD );
22+ assert( debug_state == DEBUG_NO_CHILD );
23 if ( ! CreatePipe( &pipe1[ 0 ], &pipe1[ 1 ], &sa, 0 ) )
24 {
25 printf("internal error\n");
26@@ -1176,7 +1176,7 @@ static void debug_start_child( int argc, const char * * argv )
27 int read_fd;
28 int pid;
29 int i;
30- assert( DEBUG_STATE == DEBUG_NO_CHILD );
31+ assert( debug_state == DEBUG_NO_CHILD );
32 pipe(pipe1);
33 pipe(pipe2);
34 pid = fork();
35--
362.14.1
37