From d61ad95c7690155a18b2abd39bf8df37e9a02908 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 14 Jun 2013 13:32:45 +0200
Subject: ldconfig: Include system's default paths

---
 remote/setup_target | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'remote/setup_target')

diff --git a/remote/setup_target b/remote/setup_target
index b0565550..54ed0cb0 100755
--- a/remote/setup_target
+++ b/remote/setup_target
@@ -314,7 +314,12 @@ post_process_target() {
 		rm -r "${TARGET_BUILD_DIR}/lib/systemd"
 	fi
 
-	ldconfig -r "${TARGET_BUILD_DIR}"
+	# figure out all relevant ld-paths
+	local LDTEMP="$TARGET_BUILD_DIR/ldconf-temp"
+	grep -h '^\s*/' /etc/ld.so.conf /etc/ld.so.conf.d/* > "$LDTEMP"
+	# TODO: Echo other stuff to $LDTEMP (but figure out if first or last match wins)
+	ldconfig -v -r "${TARGET_BUILD_DIR}" -f "/ldconf-temp"
+	unlink "$LDTEMP"
 
 }
 
-- 
cgit v1.2.3-55-g7522