From 22ea4eb964a7565657c3f76e3e1bffd9e21e264b Mon Sep 17 00:00:00 2001
From: Warren Togami <wtogami@gmail.com>
Date: Tue, 8 Apr 2014 18:20:44 -1000
Subject: [PATCH] Use glibc compat. Removes the static linux builds as this
 enables compatibility with older distros again.

---
 contrib/gitian-descriptors/gitian-linux.yml | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml
index a40924b93..0a149e55a 100644
--- a/contrib/gitian-descriptors/gitian-linux.yml
+++ b/contrib/gitian-descriptors/gitian-linux.yml
@@ -41,7 +41,7 @@ script: |
   cd ../build
 
   function do_configure {
-    ./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=dogecoin ${OPTFLAGS}" BOOST_CHRONO_EXTRALIBS="-lrt"
+    ./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=dogecoin ${OPTFLAGS}" BOOST_CHRONO_EXTRALIBS="-lrt" --enable-glibc-back-compat
   }
   #
   cd dogecoin
@@ -60,19 +60,6 @@ script: |
   make $MAKEOPTS install-strip
   make $MAKEOPTS clean
 
-  # Build fully static versions of dogecoind and dogecoin-cli for older Linux distros
-  STATIC_BINDIR="$HOME/bindir.static"
-  mkdir -p $STATIC_BINDIR
-  # For 32-bit, -pie cannot be used with -static, as invalid executables are generated
-  # For 64-bit, -pie with -static causes a link error
-  # Disable hardening in configure and manually pass 'static-safe' hardening flags
-  OPTFLAGS='-O2 -static -Wstack-protector -fstack-protector-all -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -Wl,-z,relro -Wl,-z,now'
-  do_configure --bindir=$STATIC_BINDIR --disable-tests --enable-upnp-default --without-gui --disable-hardening
-  make $MAKEOPTS
-  make $MAKEOPTS install-strip
-  cp $STATIC_BINDIR/dogecoind $BINDIR/dogecoin.static
-  cp $STATIC_BINDIR/dogecoin-cli $BINDIR/dogecoin-cli.static
-  
   # sort distribution tar file and normalize user/group/mtime information for deterministic output
   mkdir -p $OUTDIR/src
   rm -rf $TEMPDIR