From 6fe42d07fa6f5ab4ff175be5f8014734954c5b52 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 22 May 2015 14:49:32 +0200 Subject: gptfdisk: fix static linking issue with iconv Fixes: http://autobuild.buildroot.net/results/e89/e891a5bab72690a530781ad87d5804a53a209b5c/ Similar to libintl, some of the gptfdisk dependencies may link against libiconv, so we need to do so as well when linking statically. Signed-off-by: Peter Korsgaard --- package/gptfdisk/gptfdisk.mk | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'package/gptfdisk') diff --git a/package/gptfdisk/gptfdisk.mk b/package/gptfdisk/gptfdisk.mk index c11b1d9cd4..e84e3d39e8 100644 --- a/package/gptfdisk/gptfdisk.mk +++ b/package/gptfdisk/gptfdisk.mk @@ -21,13 +21,17 @@ ifeq ($(BR2_PACKAGE_GPTFDISK_CGDISK),y) GPTFDISK_DEPENDENCIES += ncurses endif -ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE)$(BR2_STATIC_LIBS),yy) -GPTFDISK_MAKE_OPTS += LDLIBS=-lintl +ifeq ($(BR2_STATIC_LIBS),y) +# gptfdisk dependencies may link against libintl/libiconv, so we need +# to do so as well when linking statically +GPTFDISK_LDLIBS = \ + $(if $(BR2_PACKAGE_GETTEXT),-lintl) \ + $(if $(BR2_PACKAGE_LIBICONV),-liconv) endif define GPTFDISK_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \ - $(GPTFDISK_MAKE_OPTS) $(GPTFDISK_TARGETS_y) + LDLIBS='$(GPTFDISK_LDLIBS)' $(GPTFDISK_TARGETS_y) endef define GPTFDISK_INSTALL_TARGET_CMDS -- cgit v1.2.1