debian/rules: Entirely ignore $LD_PRELOAD instead of just libfakeroot in the link...

To also avoid libeatmydata.

Closes: #790546

diff --git a/debian/changelog b/debian/changelog
index 0e8006e37db3505915f7db6fb77fd3a8618cfe15..7106d170db93a0fd45d0da7c70c33936ef7eeb91 100644 (file)
--- 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 <mpitt@debian.org>  Mon, 29 Jun 2015 07:42:50 +0200
 

diff --git a/debian/rules b/debian/rules
index 46e564e51c115821a30b83d940cc4478cbe3ccf3..ded02b726b042c5542938e5489cc1a4393da5fa8 100755 (executable)
--- 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