Skip to content

Commit 49a3352

Browse files
wtogamitheuni
authored andcommitted
gitian-linux: --enable-glibc-back-compat
1 parent d5aab70 commit 49a3352

File tree

1 file changed

+1
-14
lines changed

1 file changed

+1
-14
lines changed

contrib/gitian-descriptors/gitian-linux.yml

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ script: |
4141
cd ../build
4242
4343
function do_configure {
44-
./configure "$@" --enable-upnp-default --prefix=$STAGING --with-protoc-bindir=$STAGING/host/bin --with-boost=$STAGING --disable-maintainer-mode --disable-dependency-tracking PKG_CONFIG_PATH="$STAGING/lib/pkgconfig" CPPFLAGS="-I$STAGING/include ${OPTFLAGS}" LDFLAGS="-L$STAGING/lib ${OPTFLAGS}" CXXFLAGS="-frandom-seed=bitcoin ${OPTFLAGS}" BOOST_CHRONO_EXTRALIBS="-lrt"
44+
./configure "$@" --enable-upnp-default --prefix=$STAGING --with-protoc-bindir=$STAGING/host/bin --with-boost=$STAGING --disable-maintainer-mode --disable-dependency-tracking PKG_CONFIG_PATH="$STAGING/lib/pkgconfig" CPPFLAGS="-I$STAGING/include ${OPTFLAGS}" LDFLAGS="-L$STAGING/lib ${OPTFLAGS}" CXXFLAGS="-frandom-seed=bitcoin ${OPTFLAGS}" BOOST_CHRONO_EXTRALIBS="-lrt" --enable-glibc-back-compat
4545
}
4646
#
4747
cd bitcoin
@@ -60,19 +60,6 @@ script: |
6060
make $MAKEOPTS install-strip
6161
make $MAKEOPTS clean
6262
63-
# Build fully static versions of bitcoind and bitcoin-cli for older Linux distros
64-
STATIC_BINDIR="$HOME/bindir.static"
65-
mkdir -p $STATIC_BINDIR
66-
# For 32-bit, -pie cannot be used with -static, as invalid executables are generated
67-
# For 64-bit, -pie with -static causes a link error
68-
# Disable hardening in configure and manually pass 'static-safe' hardening flags
69-
OPTFLAGS='-O2 -static -Wstack-protector -fstack-protector-all -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -Wl,-z,relro -Wl,-z,now'
70-
do_configure --bindir=$STATIC_BINDIR --disable-tests --enable-upnp-default --without-gui --disable-hardening
71-
make $MAKEOPTS
72-
make $MAKEOPTS install-strip
73-
cp $STATIC_BINDIR/bitcoind $BINDIR/bitcoind.static
74-
cp $STATIC_BINDIR/bitcoin-cli $BINDIR/bitcoin-cli.static
75-
7663
# sort distribution tar file and normalize user/group/mtime information for deterministic output
7764
mkdir -p $OUTDIR/src
7865
rm -rf $TEMPDIR

0 commit comments

Comments
 (0)