From 43713266cf01cbc8d4e057f60c3c4b3b0101b4b8 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 25 May 2015 21:58:03 +0200 Subject: [PATCH] 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: Peter Korsgaard --- package/gptfdisk/gptfdisk.mk | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/package/gptfdisk/gptfdisk.mk b/package/gptfdisk/gptfdisk.mk index e84e3d39e8..f812376dea 100644 --- a/package/gptfdisk/gptfdisk.mk +++ b/package/gptfdisk/gptfdisk.mk @@ -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 -- 2.30.2