Skip to content

Commit 1cbbeb6

Browse files
committed
gitian: Add openssl to linux deps
Build OpenSSL instead of using distribution-provided library.
1 parent 64be7f7 commit 1cbbeb6

File tree

2 files changed

+15
-5
lines changed

2 files changed

+15
-5
lines changed

contrib/gitian-descriptors/deps-linux.yml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ packages:
1515
reference_datetime: "2013-06-01 00:00:00"
1616
remotes: []
1717
files:
18+
- "openssl-1.0.1e.tar.gz"
1819
- "miniupnpc-1.8.tar.gz"
1920
- "qrencode-3.4.3.tar.bz2"
2021
- "protobuf-2.5.0.tar.bz2"
@@ -24,11 +25,21 @@ script: |
2425
OPTFLAGS='-O2'
2526
export LIBRARY_PATH="$STAGING/lib"
2627
# Integrity Check
28+
echo "f74f15e8c8ff11aa3d5bb5f276d202ec18d7246e95f961db76054199c69c1ae3 openssl-1.0.1e.tar.gz" | sha256sum -c
2729
echo "bc5f73c7b0056252c1888a80e6075787a1e1e9112b808f863a245483ff79859c miniupnpc-1.8.tar.gz" | sha256sum -c
2830
echo "dfd71487513c871bad485806bfd1fdb304dedc84d2b01a8fb8e0940b50597a98 qrencode-3.4.3.tar.bz2" | sha256sum -c
2931
echo "13bfc5ae543cf3aa180ac2485c0bc89495e3ae711fc6fab4f8ffe90dfb4bb677 protobuf-2.5.0.tar.bz2" | sha256sum -c
3032
echo "12edc0df75bf9abd7f82f821795bcee50f42cb2e5f76a6a281b85732798364ef db-4.8.30.NC.tar.gz" | sha256sum -c
3133
34+
#
35+
tar xzf openssl-1.0.1e.tar.gz
36+
cd openssl-1.0.1e
37+
# need -fPIC to avoid relocation error in 64 bit builds
38+
./config no-shared no-zlib no-dso no-krb5 --openssldir=$STAGING -fPIC
39+
make
40+
make install_sw
41+
cd ..
42+
#
3243
tar xzfm miniupnpc-1.8.tar.gz
3344
cd miniupnpc-1.8
3445
# miniupnpc is always built with -fPIC
@@ -60,4 +71,4 @@ script: |
6071
cd ../..
6172
#
6273
cd $STAGING
63-
zip -r $OUTDIR/bitcoin-deps-linux${GBUILD_BITS}-gitian-r1.zip include lib bin host
74+
zip -r $OUTDIR/bitcoin-deps-linux${GBUILD_BITS}-gitian-r2.zip include lib bin host

contrib/gitian-descriptors/gitian-linux.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ architectures:
77
- "amd64"
88
packages:
99
- "libqt4-dev"
10-
- "libssl-dev"
1110
- "git-core"
1211
- "unzip"
1312
- "pkg-config"
@@ -21,8 +20,8 @@ remotes:
2120
- "url": "https://github.com/bitcoin/bitcoin.git"
2221
"dir": "bitcoin"
2322
files:
24-
- "bitcoin-deps-linux32-gitian-r1.zip"
25-
- "bitcoin-deps-linux64-gitian-r1.zip"
23+
- "bitcoin-deps-linux32-gitian-r2.zip"
24+
- "bitcoin-deps-linux64-gitian-r2.zip"
2625
- "boost-linux32-1.55.0-gitian-r1.zip"
2726
- "boost-linux64-1.55.0-gitian-r1.zip"
2827
script: |
@@ -34,7 +33,7 @@ script: |
3433
#
3534
mkdir -p $STAGING
3635
cd $STAGING
37-
unzip ../build/bitcoin-deps-linux${GBUILD_BITS}-gitian-r1.zip
36+
unzip ../build/bitcoin-deps-linux${GBUILD_BITS}-gitian-r2.zip
3837
unzip ../build/boost-linux${GBUILD_BITS}-1.55.0-gitian-r1.zip
3938
cd ../build
4039
#

0 commit comments

Comments
 (0)