cerc-io/solidity
16
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #5738 from ethereum/emscriptenBoost168

Browse Source 
Update to boost 1.68 for emscripten builds.
This commit is contained in:
chriseth 2019-01-07 14:34:23 +01:00 committed by GitHub
commit c00c0690e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.circleci/config.yml
View File

@ -54,7 +54,7 @@ jobs:
name: Save Boost build name: Save Boost build
key: *boost-cache-key key: *boost-cache-key
paths: paths:
- boost_1_67_0 - boost_1_68_0
- store_artifacts: - store_artifacts:
path: build/libsolc/soljson.js path: build/libsolc/soljson.js
destination: soljson.js destination: soljson.js

2
.travis.yml
View File

@ -177,7 +177,7 @@ git:
cache: cache:
ccache: true ccache: true
directories: directories:
- boost_1_67_0 - boost_1_68_0
- $HOME/.local - $HOME/.local
install: install:

14
scripts/travis-emscripten/build_emscripten.sh
View File

@ -58,7 +58,7 @@ fi
# Boost # Boost
echo -en 'travis_fold:start:compiling_boost\\r' echo -en 'travis_fold:start:compiling_boost\\r'
cd "$WORKSPACE"/boost_1_67_0 cd "$WORKSPACE"/boost_1_68_0
# if b2 exists, it is a fresh checkout, otherwise it comes from the cache # if b2 exists, it is a fresh checkout, otherwise it comes from the cache
# and is already compiled # and is already compiled
test -e b2 && ( test -e b2 && (
@ -84,12 +84,12 @@ cmake \
-DBoost_FOUND=1 \ -DBoost_FOUND=1 \
-DBoost_USE_STATIC_LIBS=1 \ -DBoost_USE_STATIC_LIBS=1 \
-DBoost_USE_STATIC_RUNTIME=1 \ -DBoost_USE_STATIC_RUNTIME=1 \
-DBoost_INCLUDE_DIR="$WORKSPACE"/boost_1_67_0/ \ -DBoost_INCLUDE_DIR="$WORKSPACE"/boost_1_68_0/ \
-DBoost_FILESYSTEM_LIBRARY_RELEASE="$WORKSPACE"/boost_1_67_0/libboost_filesystem.a \ -DBoost_FILESYSTEM_LIBRARY_RELEASE="$WORKSPACE"/boost_1_68_0/libboost_filesystem.a \
-DBoost_PROGRAM_OPTIONS_LIBRARY_RELEASE="$WORKSPACE"/boost_1_67_0/libboost_program_options.a \ -DBoost_PROGRAM_OPTIONS_LIBRARY_RELEASE="$WORKSPACE"/boost_1_68_0/libboost_program_options.a \
-DBoost_REGEX_LIBRARY_RELEASE="$WORKSPACE"/boost_1_67_0/libboost_regex.a \ -DBoost_REGEX_LIBRARY_RELEASE="$WORKSPACE"/boost_1_68_0/libboost_regex.a \
-DBoost_SYSTEM_LIBRARY_RELEASE="$WORKSPACE"/boost_1_67_0/libboost_system.a \ -DBoost_SYSTEM_LIBRARY_RELEASE="$WORKSPACE"/boost_1_68_0/libboost_system.a \
-DBoost_UNIT_TEST_FRAMEWORK_LIBRARY_RELEASE="$WORKSPACE"/boost_1_67_0/libboost_unit_test_framework.a \ -DBoost_UNIT_TEST_FRAMEWORK_LIBRARY_RELEASE="$WORKSPACE"/boost_1_68_0/libboost_unit_test_framework.a \
-DTESTS=0 \ -DTESTS=0 \
.. ..
make -j 4 make -j 4

10
scripts/travis-emscripten/install_deps.sh
View File

@ -30,15 +30,15 @@
set -ev set -ev
echo -en 'travis_fold:start:installing_dependencies\\r' echo -en 'travis_fold:start:installing_dependencies\\r'
test -e boost_1_67_0 -a -e boost_1_67_0/boost || ( test -e boost_1_68_0 -a -e boost_1_68_0/boost || (
rm -rf boost_1_67_0 rm -rf boost_1_68_0
rm -f boost.tar.xz rm -f boost.tar.xz
wget -q 'https://sourceforge.net/projects/boost/files/boost/1.67.0/boost_1_67_0.tar.gz/download'\ wget -q 'https://sourceforge.net/projects/boost/files/boost/1.68.0/boost_1_68_0.tar.gz/download'\
-O boost.tar.xz -O boost.tar.xz
test "$(shasum boost.tar.xz)" = "77e73c9fd7bf85b14067767b9e8fdc39b49ee0f2 boost.tar.xz" test "$(shasum boost.tar.xz)" = "a78cf6ebb111a48385dd0c135e145a6819a8c856 boost.tar.xz"
tar -xzf boost.tar.xz tar -xzf boost.tar.xz
rm boost.tar.xz rm boost.tar.xz
cd boost_1_67_0 cd boost_1_68_0
./bootstrap.sh ./bootstrap.sh
wget -q 'https://raw.githubusercontent.com/tee3/boost-build-emscripten/master/emscripten.jam' wget -q 'https://raw.githubusercontent.com/tee3/boost-build-emscripten/master/emscripten.jam'
test "$(shasum emscripten.jam)" = "a7e13fc2c1e53b0e079ef440622f879aa6da3049 emscripten.jam" test "$(shasum emscripten.jam)" = "a7e13fc2c1e53b0e079ef440622f879aa6da3049 emscripten.jam"