Commit 82cf4f00 authored by Gustavo Zacarias's avatar Gustavo Zacarias Committed by Thomas Petazzoni
Browse files

libiconv: disable building the preloadable library 



We were already removing the preloadable iconv library (that can be
used through LD_PRELOAD to override the C library iconv
implementation) from staging/target, but it was still built. And this
causes issues in static only scenarios, so this patch changes that to
not even build/install the preloadable library.

[Thomas: changed Gustavo's patch to take into the fact that we never
need the preloadable library.]

Signed-off-by: default avatarGustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent b737b12d

package/libiconv/libiconv.mk

+6 −10
Original line number Diff line number Diff line
@@ -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))