mirrors/buildroot
0
0
Fork 0
mirror of https://git.busybox.net/buildroot.git synced 2024-11-24 22:13:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

libiconv: disable building the preloadable library

Browse Source 
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: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Gustavo Zacarias 2014-05-25 19:12:58 -03:00 committed by Thomas Petazzoni
parent b737b12dad
commit 82cf4f00ac
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
package/libiconv/libiconv.mk
View File

@ -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))