Message ID | 1362133407-5840-4-git-send-email-gustavo@zacarias.com.ar |
---|---|
State | Superseded |
Headers | show |
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:
Gustavo> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Gustavo> ---
Gustavo> package/dosfstools/Config.in | 1 +
Gustavo> package/dosfstools/dosfstools.mk | 8 +++++---
Gustavo> 2 files changed, 6 insertions(+), 3 deletions(-)
Gustavo> diff --git a/package/dosfstools/Config.in b/package/dosfstools/Config.in
Gustavo> index 1b92026..6573cda 100644
Gustavo> --- a/package/dosfstools/Config.in
Gustavo> +++ b/package/dosfstools/Config.in
Gustavo> @@ -1,6 +1,7 @@
Gustavo> config BR2_PACKAGE_DOSFSTOOLS
Gustavo> bool "dosfstools"
Gustavo> depends on BR2_LARGEFILE
Gustavo> + select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
Gustavo> help
Gustavo> Tools for creating and checking DOS FAT filesystems.
Gustavo> diff --git a/package/dosfstools/dosfstools.mk b/package/dosfstools/dosfstools.mk
Gustavo> index 4f89364..3bb6a2f 100644
Gustavo> --- a/package/dosfstools/dosfstools.mk
Gustavo> +++ b/package/dosfstools/dosfstools.mk
Gustavo> @@ -4,8 +4,10 @@
Gustavo> #
Gustavo> #############################################################
Gustavo> -DOSFSTOOLS_VERSION = 3.0.12
Gustavo> +DOSFSTOOLS_VERSION = 3.0.15
Gustavo> DOSFSTOOLS_SITE = http://fossies.org/linux/misc/
Gustavo> +DOSFSTOOLS_DEPENDENCIES = $(if $(BR2_ENABLE_LOCALE),,libiconv)
Gustavo> +DOSFSTOOLS_LINK_ICONV = $(if $(BR2_ENABLE_LOCALE),,-liconv)
Gustavo> DOSFSTOOLS_LICENSE = GPLv3+
Gustavo> DOSFSTOOLS_LICENSE_FILES = COPYING
Gustavo> MKDOSFS_BINARY = mkdosfs
Gustavo> @@ -13,8 +15,8 @@ DOSFSCK_BINARY = dosfsck
Gustavo> DOSFSLABEL_BINARY = dosfslabel
Gustavo> define DOSFSTOOLS_BUILD_CMDS
Gustavo> - $(MAKE) CFLAGS="$(TARGET_CFLAGS)" LDFLAGS="$(TARGET_LDFLAGS)" \
Gustavo> - CC="$(TARGET_CC)" -C $(@D)
Gustavo> + $(MAKE) CFLAGS="$(TARGET_CFLAGS)" CC="$(TARGET_CC)" \
Gustavo> + LDFLAGS="$(TARGET_LDFLAGS) $(DOSFSTOOLS_LINK_ICONV)" -C $(@D)
I would prefer to see A DOSFSTOOLS_LDFLAGS instead of this. Care to
resend with that fixed?
diff --git a/package/dosfstools/Config.in b/package/dosfstools/Config.in index 1b92026..6573cda 100644 --- a/package/dosfstools/Config.in +++ b/package/dosfstools/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_DOSFSTOOLS bool "dosfstools" depends on BR2_LARGEFILE + select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE help Tools for creating and checking DOS FAT filesystems. diff --git a/package/dosfstools/dosfstools.mk b/package/dosfstools/dosfstools.mk index 4f89364..3bb6a2f 100644 --- a/package/dosfstools/dosfstools.mk +++ b/package/dosfstools/dosfstools.mk @@ -4,8 +4,10 @@ # ############################################################# -DOSFSTOOLS_VERSION = 3.0.12 +DOSFSTOOLS_VERSION = 3.0.15 DOSFSTOOLS_SITE = http://fossies.org/linux/misc/ +DOSFSTOOLS_DEPENDENCIES = $(if $(BR2_ENABLE_LOCALE),,libiconv) +DOSFSTOOLS_LINK_ICONV = $(if $(BR2_ENABLE_LOCALE),,-liconv) DOSFSTOOLS_LICENSE = GPLv3+ DOSFSTOOLS_LICENSE_FILES = COPYING MKDOSFS_BINARY = mkdosfs @@ -13,8 +15,8 @@ DOSFSCK_BINARY = dosfsck DOSFSLABEL_BINARY = dosfslabel define DOSFSTOOLS_BUILD_CMDS - $(MAKE) CFLAGS="$(TARGET_CFLAGS)" LDFLAGS="$(TARGET_LDFLAGS)" \ - CC="$(TARGET_CC)" -C $(@D) + $(MAKE) CFLAGS="$(TARGET_CFLAGS)" CC="$(TARGET_CC)" \ + LDFLAGS="$(TARGET_LDFLAGS) $(DOSFSTOOLS_LINK_ICONV)" -C $(@D) endef DOSFSTOOLS_INSTALL_BIN_FILES_$(BR2_PACKAGE_DOSFSTOOLS_MKDOSFS)+=$(MKDOSFS_BINARY)
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> --- package/dosfstools/Config.in | 1 + package/dosfstools/dosfstools.mk | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-)