Use cross ldconfig instead of host version

diff --git a/package/Makefile.in b/package/Makefile.in
index 071635b58cc60d0dd6bd94d8caf5ce0673efbd35..d7a817d8d7072300a7016b7046d792ca92daa7bb 100644 (file)
--- 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 1a69b5002d28207835f9fd815a36dd38825f5e64..e04cff3fd980ac411d2283f8188dd2cf94197837 100644 (file)
--- 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 334048cd4f5bf4c82713fc56c8e1174bc030d84e..00064b4338785af199d29bdaad294d7d6659460f 100644 (file)
--- 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 dda8013e602518aab1353ce2aa7358a6485ba4e5..b79e9b2662cdfc7e5a10781503214db9b31d9c50 100644 (file)
--- 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 3341c0bf82c368dc0b6fa0a7667c60086250e3f6..311a60029bdbcb537117a862235fcc3d9fe78d51 100644 (file)
--- 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 c9eb743276b435d2d7b2573e5622616af1b88078..3084aa08dadb604842087ce2c4d4fb29479817e9 100644 (file)
--- 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 b1dd0b4b2d0b127c8bacff91c3a89c4b0c85e424..18293d7ecc99a8c45f6ac8a97ba693a13bf370f2 100644 (file)
--- 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