mirror of
https://github.com/ethereum/solidity
synced 2023-10-03 13:03:40 +00:00
Drop CryptoPP leftovers
Especially, do not compile CryptoPP for Emscripten.
This commit is contained in:
parent
10019d4a5e
commit
598154ed17
@ -135,7 +135,6 @@ git:
|
||||
cache:
|
||||
ccache: true
|
||||
directories:
|
||||
- cryptopp
|
||||
- boost_1_57_0
|
||||
- build
|
||||
|
||||
|
@ -70,7 +70,6 @@
|
||||
|
||||
#include "vector_ref.h"
|
||||
|
||||
// CryptoPP defines byte in the global namespace, so must we.
|
||||
using byte = uint8_t;
|
||||
|
||||
// Quote a given token stream to turn it into a string.
|
||||
|
@ -84,7 +84,6 @@ Section: science
|
||||
Priority: extra
|
||||
Maintainer: Christian (Buildserver key) <builds@ethereum.org>
|
||||
Build-Depends: debhelper (>= 9.0.0),
|
||||
libcryptopp-dev,
|
||||
cmake,
|
||||
g++-4.8,
|
||||
git,
|
||||
|
@ -40,18 +40,6 @@ apt-get -y install git-core
|
||||
|
||||
export WORKSPACE=/src
|
||||
|
||||
# CryptoPP
|
||||
echo -en 'travis_fold:start:compiling_cryptopp\\r'
|
||||
cd "$WORKSPACE/cryptopp"
|
||||
# if .git exists, it is a fresh checkout, otherwise it comes from the cache
|
||||
# and is already compiled
|
||||
test -e .git && (
|
||||
emcmake cmake -DCRYPTOPP_LIBRARY_TYPE=STATIC -DCRYPTOPP_RUNTIME_TYPE=STATIC && emmake make -j 4
|
||||
ln -s . src/cryptopp || true
|
||||
rm -rf .git
|
||||
)
|
||||
echo -en 'travis_fold:end:compiling_cryptopp\\r'
|
||||
|
||||
# Boost
|
||||
echo -en 'travis_fold:start:compiling_boost\\r'
|
||||
cd "$WORKSPACE"/boost_1_57_0
|
||||
@ -98,8 +86,6 @@ emcmake cmake \
|
||||
-DBoost_THREAD_LIBRARIES="$WORKSPACE"/boost_1_57_0/libboost_thread.a \
|
||||
-DBoost_UNIT_TEST_FRAMEWORK_LIBRARY="$WORKSPACE"/boost_1_57_0/libboost_unit_test_framework.a \
|
||||
-DBoost_UNIT_TEST_FRAMEWORK_LIBRARIES="$WORKSPACE"/boost_1_57_0/libboost_unit_test_framework.a \
|
||||
-DCRYPTOPP_LIBRARY="$WORKSPACE"/cryptopp/src/libcryptlib.a \
|
||||
-DCRYPTOPP_INCLUDE_DIR="$WORKSPACE"/cryptopp/src/ \
|
||||
-DDev_DEVCORE_LIBRARY="$WORKSPACE"/solidity/build/libdevcore/libsoldevcore.a \
|
||||
-DEth_EVMASM_LIBRARY="$WORKSPACE"/solidity/build/libevmasm/libsolevmasm.a \
|
||||
-DETH_STATIC=1 -DTESTS=0 \
|
||||
|
@ -30,7 +30,6 @@
|
||||
set -ev
|
||||
|
||||
echo -en 'travis_fold:start:installing_dependencies\\r'
|
||||
test -e cryptopp -a -e cryptopp/src || git clone https://github.com/mmoss/cryptopp.git
|
||||
test -e boost_1_57_0 -a -e boost_1_57_0/boost || (
|
||||
wget 'http://downloads.sourceforge.net/project/boost/boost/'\
|
||||
'1.57.0/boost_1_57_0.tar.bz2?r=http%3A%2F%2Fsourceforge.net%2F'\
|
||||
|
Loading…
Reference in New Issue
Block a user