From 375b14fbeb876aaa550f0bfee013a15ca4191202 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 1 Sep 2010 22:45:13 +0200 Subject: libiconv: convert old-style hook to new-style hook In addition to that, remove useless stripping since it is done globally. Signed-off-by: Thomas Petazzoni --- package/libiconv/libiconv.mk | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'package/libiconv') diff --git a/package/libiconv/libiconv.mk b/package/libiconv/libiconv.mk index a3f762ab6..c56a98615 100644 --- a/package/libiconv/libiconv.mk +++ b/package/libiconv/libiconv.mk @@ -12,17 +12,19 @@ LIBICONV_INSTALL_TARGET = YES LIBICONV_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install -$(eval $(call AUTOTARGETS,package,libiconv)) +# Remove not used preloadable libiconv.so +define LIBICONV_TARGET_REMOVE_PRELOADABLE_LIBS + rm -f $(TARGET_DIR)/usr/lib/preloadable_libiconv.so +endef -$(LIBICONV_HOOK_POST_INSTALL): - # Remove not used preloadable libiconv.so +define LIBICONV_STAGING_REMOVE_PRELOADABLE_LIBS rm -f $(STAGING_DIR)/usr/lib/preloadable_libiconv.so - rm -f $(TARGET_DIR)/usr/lib/preloadable_libiconv.so -ifneq ($(BR2_ENABLE_DEBUG),y) - $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libiconv.so.* - $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libcharset.so.* -endif - touch $@ +endef + +LIBICONV_POST_INSTALL_TARGET_HOOKS += LIBICONV_TARGET_REMOVE_PRELOADABLE_LIBS +LIBICONV_POST_INSTALL_STAGING_HOOKS += LIBICONV_STAGING_REMOVE_PRELOADABLE_LIBS + +$(eval $(call AUTOTARGETS,package,libiconv)) # Configurations where the toolchain supports locales and the libiconv # package is enabled are incorrect, because the toolchain already -- cgit v1.2.3