diff options
| author | Andre McCurdy <armccurdy@gmail.com> | 2015-11-12 13:00:39 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-11-25 08:08:09 +0000 |
| commit | 6bfa1dcc6ee28e6137359d9d32a4f6fe45bddb03 (patch) | |
| tree | 32a41091aaa63db1c69cc8b52ce4aaba432237a1 | |
| parent | 16d7bfd5e289dde74eb1d5a11828b8a1be573565 (diff) | |
| download | poky-6bfa1dcc6ee28e6137359d9d32a4f6fe45bddb03.tar.gz | |
boost.inc: remove unused parameter from get_boost_parallel_make()
The bb parameter seems to have been accidentally left behind after:
http://git.openembedded.org/openembedded-core/commit/?id=1ff36aaec25a7ee89514366fe484345e8d1d7b64
(From OE-Core rev: 871d3279fd3360628c8fd9a37134eca541b10636)
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-support/boost/boost.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-support/boost/boost.inc b/meta/recipes-support/boost/boost.inc index 3288e845f9..a1b434d86c 100644 --- a/meta/recipes-support/boost/boost.inc +++ b/meta/recipes-support/boost/boost.inc | |||
| @@ -114,7 +114,7 @@ BJAM_TOOLS = "--ignore-site-config \ | |||
| 114 | 114 | ||
| 115 | # use PARALLEL_MAKE to speed up the build, but limit it by -j 64, greater paralelism causes bjam to segfault or to ignore -j | 115 | # use PARALLEL_MAKE to speed up the build, but limit it by -j 64, greater paralelism causes bjam to segfault or to ignore -j |
| 116 | # https://svn.boost.org/trac/boost/ticket/7634 | 116 | # https://svn.boost.org/trac/boost/ticket/7634 |
| 117 | def get_boost_parallel_make(bb, d): | 117 | def get_boost_parallel_make(d): |
| 118 | pm = d.getVar('PARALLEL_MAKE', True) | 118 | pm = d.getVar('PARALLEL_MAKE', True) |
| 119 | if pm: | 119 | if pm: |
| 120 | # look for '-j' and throw other options (e.g. '-l') away | 120 | # look for '-j' and throw other options (e.g. '-l') away |
| @@ -136,7 +136,7 @@ def get_boost_parallel_make(bb, d): | |||
| 136 | 136 | ||
| 137 | return "" | 137 | return "" |
| 138 | 138 | ||
| 139 | BOOST_PARALLEL_MAKE = "${@get_boost_parallel_make(bb, d)}" | 139 | BOOST_PARALLEL_MAKE = "${@get_boost_parallel_make(d)}" |
| 140 | BJAM_OPTS = '${BOOST_PARALLEL_MAKE} \ | 140 | BJAM_OPTS = '${BOOST_PARALLEL_MAKE} \ |
| 141 | ${BJAM_TOOLS} \ | 141 | ${BJAM_TOOLS} \ |
| 142 | -sBOOST_BUILD_USER_CONFIG=${S}/tools/build/example/user-config.jam \ | 142 | -sBOOST_BUILD_USER_CONFIG=${S}/tools/build/example/user-config.jam \ |
