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 <peter@korsgaard.com>
This commit is contained in:
parent
c6ce119cb0
commit
6fe42d07fa
|
@ -21,13 +21,17 @@ ifeq ($(BR2_PACKAGE_GPTFDISK_CGDISK),y)
|
||||||
GPTFDISK_DEPENDENCIES += ncurses
|
GPTFDISK_DEPENDENCIES += ncurses
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE)$(BR2_STATIC_LIBS),yy)
|
ifeq ($(BR2_STATIC_LIBS),y)
|
||||||
GPTFDISK_MAKE_OPTS += LDLIBS=-lintl
|
# 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
|
endif
|
||||||
|
|
||||||
define GPTFDISK_BUILD_CMDS
|
define GPTFDISK_BUILD_CMDS
|
||||||
$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \
|
$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \
|
||||||
$(GPTFDISK_MAKE_OPTS) $(GPTFDISK_TARGETS_y)
|
LDLIBS='$(GPTFDISK_LDLIBS)' $(GPTFDISK_TARGETS_y)
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define GPTFDISK_INSTALL_TARGET_CMDS
|
define GPTFDISK_INSTALL_TARGET_CMDS
|
||||||
|
|
Loading…
Reference in New Issue