From 39c2fc412d46ee335f820d08d7d8604d4473bf48 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Tue, 30 Jun 2015 06:46:28 +0200 Subject: [PATCH] debian/rules: Entirely ignore $LD_PRELOAD instead of just libfakeroot in the link check To also avoid libeatmydata. Closes: #790546 --- debian/changelog | 2 ++ debian/rules | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 0e8006e37..7106d170d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ systemd (221-2) UNRELEASED; urgency=medium * udev: Drop doc dir symlinking. It has caused too much trouble and only marginally helps to avoid duplication. Such duplication should be dealt with at the distro, not package level. + * debian/rules: Entirely ignore $LD_PRELOAD instead of just libfakeroot in + the link check, to also avoid libeatmydata. (Closes: #790546) -- Martin Pitt Mon, 29 Jun 2015 07:42:50 +0200 diff --git a/debian/rules b/debian/rules index 46e564e51..ded02b726 100755 --- a/debian/rules +++ b/debian/rules @@ -112,7 +112,7 @@ ifeq (, $(findstring nocheck, $(DEB_BUILD_OPTIONS))) echo "Checking that executables don't link to libraries in /usr..." set -e; for e in debian/install/deb/lib/systemd/systemd*; do \ echo " $$e"; \ - OUT=`ldd $$e | grep -v libfakeroot`; if echo "$$OUT" | grep -q /usr; then \ + OUT=`env -u LD_PRELOAD ldd $$e`; if echo "$$OUT" | grep -q /usr; then \ echo "ERROR: $$e links to /usr"; echo "$$OUT"; exit 1; \ fi; \ done