From a2fb7885d7adb94d6e31aeb1775e309e03cac5bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rub=C3=A9n=20Rodr=C3=ADguez?= <ruben@trisquel.info>
Date: Sun, 23 Nov 2014 18:10:21 +0100
Subject: [PATCH] Simplify eatmydata loading for compiling

---
 makepackage | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/makepackage b/makepackage
index b210d555..5063febf 100644
--- a/makepackage
+++ b/makepackage
@@ -19,6 +19,7 @@
 
 set -e
 
+export LD_PRELOAD="${LD_PRELOAD:+$LD_PRELOAD:}/usr/lib/libeatmydata/libeatmydata.so"
 export DEBIAN_FRONTEND=noninteractive
 MEM=$(cat /proc/meminfo |grep MemTotal| awk '{print $2}')
 GPGKEY=8D8AEBF1
@@ -132,7 +133,6 @@ EOF
 
     [ $UPSTREAM != hardy -a $UPSTREAM != lucid -a $UPSTREAM != maverick ] &&  echo "force-unsafe-io" > $CHROOT/etc/dpkg/dpkg.cfg.d/02apt-speedup
     $C apt-get update
-    [ $UPSTREAM != hardy ] && $C apt-get --force-yes -y install eatmydata
     [ $UPSTREAM != hardy ] && $C apt-get --force-yes -y install sysv-rc dpkg sysvinit-utils upstart
     disablescripts
     $C apt-get --force-yes -y dist-upgrade
@@ -216,7 +216,6 @@ PACKAGE=$PACKAGE
 cd $WORKDIR
 [ -d LOGS ] || mkdir LOGS
 [ -d PACKAGES ] || mkdir PACKAGES
-export LD_PRELOAD="${LD_PRELOAD:+$LD_PRELOAD:}/usr/lib/libeatmydata/libeatmydata.so"
 export PATH="/usr/lib/ccache:${PATH}"
 bash -e make-$PACKAGE 2>&1 || exit 1
 EOF
-- 
GitLab