From 2eff0fa9b27da901a5657abb44a64ff03d305e3d Mon Sep 17 00:00:00 2001 From: Bernhard Fischer Date: Tue, 10 Jun 2008 17:22:40 +0200 Subject: [PATCH] conditional calls to TARGET_LDCONFIG A target with shared libs is optional, only call the cross-ldconfig if needed --- target/cpio/cpioroot.mk | 2 +- target/cramfs/cramfs.mk | 2 +- target/ext2/ext2root.mk | 2 +- target/initramfs/initramfs.mk | 2 +- target/jffs2/jffs2root.mk | 2 +- target/squashfs/squashfsroot.mk | 2 +- target/tar/tarroot.mk | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/target/cpio/cpioroot.mk b/target/cpio/cpioroot.mk index 8f47602..7c92123 100644 --- a/target/cpio/cpioroot.mk +++ b/target/cpio/cpioroot.mk @@ -47,7 +47,7 @@ endif ifneq ($(BR2_HAVE_INFOPAGES),y) @rm -rf $(TARGET_DIR)/usr/share/info endif - $(if $(TARGET_LDCONFIG),test -x $(TARGET_LDCONFIG) && $(TARGET_LDCONFIG) -r $(TARGET_DIR) 2>/dev/null) + $(if $(TARGET_LDCONFIG),test ! -x $(TARGET_LDCONFIG) && true || $(TARGET_LDCONFIG) -r $(TARGET_DIR) 2>/dev/null) # Use fakeroot to pretend all target binaries are owned by root rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET)) touch $(PROJECT_BUILD_DIR)/.fakeroot.00000 diff --git a/target/cramfs/cramfs.mk b/target/cramfs/cramfs.mk index 4ab2a03..0a0cd5a 100644 --- a/target/cramfs/cramfs.mk +++ b/target/cramfs/cramfs.mk @@ -56,7 +56,7 @@ endif ifneq ($(BR2_HAVE_INFOPAGES),y) @rm -rf $(TARGET_DIR)/usr/share/info endif - $(if $(TARGET_LDCONFIG),test -x $(TARGET_LDCONFIG) && $(TARGET_LDCONFIG) -r $(TARGET_DIR) 2>/dev/null) + $(if $(TARGET_LDCONFIG),test ! -x $(TARGET_LDCONFIG) && true || $(TARGET_LDCONFIG) -r $(TARGET_DIR) 2>/dev/null) # Use fakeroot to pretend all target binaries are owned by root rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(CRAMFS_TARGET)) touch $(PROJECT_BUILD_DIR)/.fakeroot.00000 diff --git a/target/ext2/ext2root.mk b/target/ext2/ext2root.mk index e2bc270..5ed9115 100644 --- a/target/ext2/ext2root.mk +++ b/target/ext2/ext2root.mk @@ -97,7 +97,7 @@ endif @test -d $(TARGET_DIR)/usr/share && \ rmdir -p --ignore-fail-on-non-empty $(TARGET_DIR)/usr/share || \ true - $(if $(TARGET_LDCONFIG),test -x $(TARGET_LDCONFIG) && $(TARGET_LDCONFIG) -r $(TARGET_DIR) 2>/dev/null) + $(if $(TARGET_LDCONFIG),test ! -x $(TARGET_LDCONFIG) && true || $(TARGET_LDCONFIG) -r $(TARGET_DIR) 2>/dev/null) # Use fakeroot to pretend all target binaries are owned by root rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(EXT2_TARGET)) touch $(PROJECT_BUILD_DIR)/.fakeroot.00000 diff --git a/target/initramfs/initramfs.mk b/target/initramfs/initramfs.mk index 5dfb30b..b55e50a 100644 --- a/target/initramfs/initramfs.mk +++ b/target/initramfs/initramfs.mk @@ -22,7 +22,7 @@ endif ifneq ($(BR2_HAVE_INFOPAGES),y) rm -rf $(TARGET_DIR)/usr/share/info endif - $(if $(TARGET_LDCONFIG),test -x $(TARGET_LDCONFIG) && $(TARGET_LDCONFIG) -r $(TARGET_DIR) 2>/dev/null) + $(if $(TARGET_LDCONFIG),test ! -x $(TARGET_LDCONFIG) && true || $(TARGET_LDCONFIG) -r $(TARGET_DIR) 2>/dev/null) # Use fakeroot to pretend all target binaries are owned by root rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET)) touch $(PROJECT_BUILD_DIR)/.fakeroot.00000 diff --git a/target/jffs2/jffs2root.mk b/target/jffs2/jffs2root.mk index eeecf97..dc5c30c 100644 --- a/target/jffs2/jffs2root.mk +++ b/target/jffs2/jffs2root.mk @@ -57,7 +57,7 @@ ifneq ($(BR2_HAVE_INFOPAGES),y) @rm -rf $(TARGET_DIR)/usr/share/info endif @rmdir -p --ignore-fail-on-non-empty $(TARGET_DIR)/usr/share - $(if $(TARGET_LDCONFIG),test -x $(TARGET_LDCONFIG) && $(TARGET_LDCONFIG) -r $(TARGET_DIR) 2>/dev/null) + $(if $(TARGET_LDCONFIG),test ! -x $(TARGET_LDCONFIG) && true || $(TARGET_LDCONFIG) -r $(TARGET_DIR) 2>/dev/null) # Use fakeroot to pretend all target binaries are owned by root rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(JFFS2_TARGET)) touch $(PROJECT_BUILD_DIR)/.fakeroot.00000 diff --git a/target/squashfs/squashfsroot.mk b/target/squashfs/squashfsroot.mk index fa94001..f8956be 100644 --- a/target/squashfs/squashfsroot.mk +++ b/target/squashfs/squashfsroot.mk @@ -51,7 +51,7 @@ endif ifneq ($(BR2_HAVE_INFOPAGES),y) @rm -rf $(TARGET_DIR)/usr/share/info endif - $(if $(TARGET_LDCONFIG),test -x $(TARGET_LDCONFIG) && $(TARGET_LDCONFIG) -r $(TARGET_DIR) 2>/dev/null) + $(if $(TARGET_LDCONFIG),test ! -x $(TARGET_LDCONFIG) && true || $(TARGET_LDCONFIG) -r $(TARGET_DIR) 2>/dev/null) # Use fakeroot to pretend all target binaries are owned by root rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(SQUASHFS_TARGET)) touch $(PROJECT_BUILD_DIR)/.fakeroot.00000 diff --git a/target/tar/tarroot.mk b/target/tar/tarroot.mk index f44d8aa..070b11a 100644 --- a/target/tar/tarroot.mk +++ b/target/tar/tarroot.mk @@ -32,7 +32,7 @@ endif ifneq ($(BR2_HAVE_INFOPAGES),y) @rm -rf $(TARGET_DIR)/usr/share/info endif - $(if $(TARGET_LDCONFIG),test -x $(TARGET_LDCONFIG) && $(TARGET_LDCONFIG) -r $(TARGET_DIR) 2>/dev/null) + $(if $(TARGET_LDCONFIG),test ! -x $(TARGET_LDCONFIG) && true || $(TARGET_LDCONFIG) -r $(TARGET_DIR) 2>/dev/null) # Use fakeroot to pretend all target binaries are owned by root rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET)) touch $(PROJECT_BUILD_DIR)/.fakeroot.00000 -- 2.11.4.GIT