Commit 43713266 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

gptfdisk: ensure correct libintl/libiconv build order 

Fixes:
http://autobuild.buildroot.net/results/c7d/c7d48554d76e39cbdf715721ae51e3516a99f97e/



We're explicitly linking against libintl/libiconv if enabled when linking
statically, but weren't ensuring that those libraries had already been built
before gptfdisk leading to linker issues.

Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent 1a59eb46

package/gptfdisk/gptfdisk.mk

+9 −3
Original line number Diff line number Diff line
@@ -24,9 +24,15 @@ endif 
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)

ifeq ($(BR2_PACKAGE_GETTEXT),y)

GPTFDISK_DEPENDENCIES += gettext

GPTFDISK_LDLIBS += -lintl

endif



ifeq ($(BR2_PACKAGE_LIBICONV),y)

GPTFDISK_DEPENDENCIES += libiconv

GPTFDISK_LDLIBS += -liconv

endif

endif



define GPTFDISK_BUILD_CMDS