NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gptfdisk: ensure correct libintl/libiconv build order

Browse Source 
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 <peter@korsgaard.com>
This commit is contained in:
Peter Korsgaard 2015-05-25 21:58:03 +02:00
parent 1a59eb4664
commit 43713266cf
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
package/gptfdisk/gptfdisk.mk
View File

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