summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2010-09-01 20:45:13 (GMT)
committer Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2010-09-12 17:26:49 (GMT)
commit375b14fbeb876aaa550f0bfee013a15ca4191202 (patch)
tree482b9331f05594406d65ffad572076c09577019b
parentc42d2a3afe5e988d5cb2eab7581ed5fb66cb3f29 (diff)
downloadbuildroot-375b14fbeb876aaa550f0bfee013a15ca4191202.tar.gz
buildroot-375b14fbeb876aaa550f0bfee013a15ca4191202.tar.bz2
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 <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/libiconv/libiconv.mk20
1 files changed, 11 insertions, 9 deletions
diff --git a/package/libiconv/libiconv.mk b/package/libiconv/libiconv.mk
index a3f762a..c56a986 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