From 6c0c83fb5639e382b67e737447afd86e4ff66081 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 8 Aug 2007 14:58:47 +0000
Subject: [PATCH] Use cross ldconfig instead of host version

---
 package/Makefile.in             | 1 +
 target/cpio/cpioroot.mk         | 2 +-
 target/cramfs/cramfs.mk         | 2 +-
 target/ext2/ext2root.mk         | 2 +-
 target/jffs2/jffs2root.mk       | 2 +-
 target/squashfs/squashfsroot.mk | 2 +-
 target/tar/tarroot.mk           | 2 +-
 7 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/package/Makefile.in b/package/Makefile.in
index 071635b58c..d7a817d8d7 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -131,6 +131,7 @@ endif
 TARGET_CC=$(TARGET_CROSS)gcc
 TARGET_CXX=$(TARGET_CROSS)g++
 TARGET_RANLIB=$(TARGET_CROSS)ranlib
+TARGET_LDCONFIG=$(TARGET_CROSS)ldconfig
 INSTALL=/usr/bin/install
 ifeq ($(BR2_STRIP_strip),y)
 STRIP=$(TARGET_CROSS)strip --remove-section=.comment --remove-section=.note
diff --git a/target/cpio/cpioroot.mk b/target/cpio/cpioroot.mk
index 1a69b5002d..e04cff3fd9 100644
--- a/target/cpio/cpioroot.mk
+++ b/target/cpio/cpioroot.mk
@@ -14,7 +14,7 @@ cpioroot: host-fakeroot makedevs cpioroot-init
 	-@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIP) 2>/dev/null || true;
 	@rm -rf $(TARGET_DIR)/usr/man
 	@rm -rf $(TARGET_DIR)/usr/info
-	-/sbin/ldconfig -r $(TARGET_DIR) 2>/dev/null
+	-$(TARGET_LDCONFIG) -r $(TARGET_DIR) 2>/dev/null
 	# Use fakeroot to pretend all target binaries are owned by root
 	rm -f $(STAGING_DIR)/_fakeroot.$(notdir $(TAR_TARGET))
 	touch $(STAGING_DIR)/.fakeroot.00000
diff --git a/target/cramfs/cramfs.mk b/target/cramfs/cramfs.mk
index 334048cd4f..00064b4338 100644
--- a/target/cramfs/cramfs.mk
+++ b/target/cramfs/cramfs.mk
@@ -52,7 +52,7 @@ cramfsroot: host-fakeroot makedevs cramfs
 	-@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIP) 2>/dev/null || true;
 	@rm -rf $(TARGET_DIR)/usr/man
 	@rm -rf $(TARGET_DIR)/usr/info
-	-/sbin/ldconfig -r $(TARGET_DIR) 2>/dev/null
+	-$(TARGET_LDCONFIG) -r $(TARGET_DIR) 2>/dev/null
 	# Use fakeroot to pretend all target binaries are owned by root
 	rm -f $(STAGING_DIR)/_fakeroot.$(notdir $(CRAMFS_TARGET))
 	touch $(STAGING_DIR)/.fakeroot.00000
diff --git a/target/ext2/ext2root.mk b/target/ext2/ext2root.mk
index dda8013e60..b79e9b2662 100644
--- a/target/ext2/ext2root.mk
+++ b/target/ext2/ext2root.mk
@@ -94,7 +94,7 @@ $(EXT2_BASE): host-fakeroot makedevs genext2fs
 	@test -d $(TARGET_DIR)/usr/share && \
 		rmdir -p --ignore-fail-on-non-empty $(TARGET_DIR)/usr/share || \
 		true
-	-/sbin/ldconfig -r $(TARGET_DIR) 2>/dev/null
+	-$(TARGET_LDCONFIG) -r $(TARGET_DIR) 2>/dev/null
 	# Use fakeroot to pretend all target binaries are owned by root
 	rm -f $(STAGING_DIR)/_fakeroot.$(notdir $(EXT2_TARGET))
 	touch $(STAGING_DIR)/.fakeroot.00000
diff --git a/target/jffs2/jffs2root.mk b/target/jffs2/jffs2root.mk
index 3341c0bf82..311a60029b 100644
--- a/target/jffs2/jffs2root.mk
+++ b/target/jffs2/jffs2root.mk
@@ -54,7 +54,7 @@ $(JFFS2_TARGET): host-fakeroot makedevs mtd-host
 	@rm -rf $(TARGET_DIR)/usr/share/man
 	@rm -rf $(TARGET_DIR)/usr/info
 	@rmdir -p --ignore-fail-on-non-empty $(TARGET_DIR)/usr/share
-	-/sbin/ldconfig -r $(TARGET_DIR) 2>/dev/null
+	-$(TARGET_LDCONFIG) -r $(TARGET_DIR) 2>/dev/null
 	# Use fakeroot to pretend all target binaries are owned by root
 	rm -f $(STAGING_DIR)/_fakeroot.$(notdir $(JFFS2_TARGET))
 	touch $(STAGING_DIR)/.fakeroot.00000
diff --git a/target/squashfs/squashfsroot.mk b/target/squashfs/squashfsroot.mk
index c9eb743276..3084aa08da 100644
--- a/target/squashfs/squashfsroot.mk
+++ b/target/squashfs/squashfsroot.mk
@@ -47,7 +47,7 @@ squashfsroot: host-fakeroot makedevs squashfs
 	-@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIP) 2>/dev/null || true;
 	@rm -rf $(TARGET_DIR)/usr/man
 	@rm -rf $(TARGET_DIR)/usr/info
-	-/sbin/ldconfig -r $(TARGET_DIR) 2>/dev/null
+	$(TARGET_LDCONFIG) -r $(TARGET_DIR) 2>/dev/null
 	# Use fakeroot to pretend all target binaries are owned by root
 	rm -f $(STAGING_DIR)/_fakeroot.$(notdir $(SQUASHFS_TARGET))
 	touch $(STAGING_DIR)/.fakeroot.00000
diff --git a/target/tar/tarroot.mk b/target/tar/tarroot.mk
index b1dd0b4b2d..18293d7ecc 100644
--- a/target/tar/tarroot.mk
+++ b/target/tar/tarroot.mk
@@ -26,7 +26,7 @@ tarroot: host-fakeroot makedevs
 	-@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIP) 2>/dev/null || true;
 	@rm -rf $(TARGET_DIR)/usr/man
 	@rm -rf $(TARGET_DIR)/usr/info
-	-/sbin/ldconfig -r $(TARGET_DIR) 2>/dev/null
+	$(TARGET_LDCONFIG) -r $(TARGET_DIR) 2>/dev/null
 	# Use fakeroot to pretend all target binaries are owned by root
 	rm -f $(STAGING_DIR)/_fakeroot.$(notdir $(TAR_TARGET))
 	touch $(STAGING_DIR)/.fakeroot.00000
-- 
2.30.2