diff options
| -rw-r--r-- | package/libiconv/libiconv.mk | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/package/libiconv/libiconv.mk b/package/libiconv/libiconv.mk index 52e2349dea..af55b603f7 100644 --- a/package/libiconv/libiconv.mk +++ b/package/libiconv/libiconv.mk @@ -10,17 +10,13 @@ LIBICONV_INSTALL_STAGING = YES LIBICONV_LICENSE = GPLv3+ (iconv program), LGPLv2+ (library) LIBICONV_LICENSE_FILES = COPYING COPYING.LIB -# Remove not used preloadable libiconv.so -define LIBICONV_TARGET_REMOVE_PRELOADABLE_LIBS - rm -f $(TARGET_DIR)/usr/lib/preloadable_libiconv.so +# Don't build the preloadable library, as we don't need it (it's only +# for LD_PRELOAD to replace glibc's iconv, but we never build libiconv +# when glibc is ued). And it causes problems for static only builds. +define LIBICONV_DISABLE_PRELOAD + $(SED) '/preload/d' $(@D)/Makefile.in endef - -define LIBICONV_STAGING_REMOVE_PRELOADABLE_LIBS - rm -f $(STAGING_DIR)/usr/lib/preloadable_libiconv.so -endef - -LIBICONV_POST_INSTALL_TARGET_HOOKS += LIBICONV_TARGET_REMOVE_PRELOADABLE_LIBS -LIBICONV_POST_INSTALL_STAGING_HOOKS += LIBICONV_STAGING_REMOVE_PRELOADABLE_LIBS +LIBICONV_PRE_CONFIGURE_HOOKS += LIBICONV_DISABLE_PRELOAD $(eval $(autotools-package)) |
