Skip to contentSkip to conversation

dosfstools: bump to version 3.0.15

PATCH New Gustavo Zacarias 2 participants 2 messages Mar 1, 2013

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 dosfstools: bump to version 3.0.15

---
 package/dosfstools/Config.in     |  2 ++
 package/dosfstools/dosfstools.mk | 10 ++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)
package/dosfstools/Config.in +2 -0
index 1b92026..bd5cf89 100644
@@ -1,6 +1,8 @@
 config BR2_PACKAGE_DOSFSTOOLS
 	bool "dosfstools"
 	depends on BR2_LARGEFILE
+	depends on BR2_USE_WCHAR
+	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	help
 	  Tools for creating and checking DOS FAT filesystems.
 
package/dosfstools/dosfstools.mk +6 -4
index 4f89364..1e1d891 100644
@@ -4,8 +4,10 @@
 #
 #############################################################
 
-DOSFSTOOLS_VERSION = 3.0.12
-DOSFSTOOLS_SITE = http://fossies.org/linux/misc/
+DOSFSTOOLS_VERSION = 3.0.15
+DOSFSTOOLS_SITE = http://fossies.org/linux/misc
+DOSFSTOOLS_DEPENDENCIES = $(if $(BR2_ENABLE_LOCALE),,libiconv)
+DOSFSTOOLS_LDFLAGS = "$(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_LDFLAGS)" -C $(@D)
 endef
 
 DOSFSTOOLS_INSTALL_BIN_FILES_$(BR2_PACKAGE_DOSFSTOOLS_MKDOSFS)+=$(MKDOSFS_BINARY)
Signature · 1 line
1.7.12.4
#1 lore raw

PATCH v2 1/1 dosfstools: bump to version 3.0.15

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Gustavo" == Gustavo Zacarias <[email protected]> writes:

Gustavo> Signed-off-by: Gustavo Zacarias <[email protected]> Gustavo> ---

 Gustavo>  package/dosfstools/Config.in     |  2 ++
 Gustavo>  package/dosfstools/dosfstools.mk | 10 ++++++----

Gustavo> 2 files changed, 8 insertions(+), 4 deletions(-)

Gustavo> diff --git a/package/dosfstools/Config.in b/package/dosfstools/Config.in Gustavo> index 1b92026..bd5cf89 100644
Gustavo> --- a/package/dosfstools/Config.in
Gustavo> +++ b/package/dosfstools/Config.in
Gustavo> @@ -1,6 +1,8 @@

 Gustavo>  config BR2_PACKAGE_DOSFSTOOLS
 Gustavo>  	bool "dosfstools"
 Gustavo>  	depends on BR2_LARGEFILE

Gustavo> + depends on BR2_USE_WCHAR
Gustavo> + select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
Gustavo> help
Gustavo> Tools for creating and checking DOS FAT filesystems.

You forgot to update the comment to say explain why it isn't available.

Gustavo> diff --git a/package/dosfstools/dosfstools.mk b/package/dosfstools/dosfstools.mk Gustavo> index 4f89364..1e1d891 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_SITE = http://fossies.org/linux/misc/
Gustavo> +DOSFSTOOLS_VERSION = 3.0.15
Gustavo> +DOSFSTOOLS_SITE = http://fossies.org/linux/misc
Gustavo> +DOSFSTOOLS_DEPENDENCIES = $(if $(BR2_ENABLE_LOCALE),,libiconv) Gustavo> +DOSFSTOOLS_LDFLAGS = "$(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_LDFLAGS)" -C $(@D)

What I ment was to stick all flags in DOSFSTOOLS_LDFLAGS. I've fixed up these things and committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard