Browse Source

fix linking with iconv

Waldemar Brodkorb 10 years ago
parent
commit
f42fb988ba
2 changed files with 9 additions and 6 deletions
  1. 3 2
      package/dosfstools/Makefile
  2. 6 4
      package/dosfstools/patches/patch-Makefile

+ 3 - 2
package/dosfstools/Makefile

@@ -5,10 +5,11 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		dosfstools
 PKG_VERSION:=		3.0.26
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		45012f5f56f2aae3afcd62120b9e5a08
 PKG_DESCR:=		utilities to create and check FAT filesystems
 PKG_SECTION:=		fs
+PKG_BUILDDEP:=		libiconv-tiny
 PKG_URL:=		http://www.daniel-baumann.ch/software/dosfstools/
 PKG_SITES:=		http://daniel-baumann.ch/files/software/dosfstools/
 
@@ -19,7 +20,7 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,DOSFSTOOLS,dosfstools,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIG_STYLE:=		manual
-XAKE_FLAGS+=		PREFIX="" OPTFLAGS="-D_FILE_OFFSET_BITS=64"
+XAKE_FLAGS+=		PREFIX=""
 
 dosfstools-install:
 	${INSTALL_DIR} ${IDIR_DOSFSTOOLS}/sbin

+ 6 - 4
package/dosfstools/patches/patch-Makefile

@@ -1,11 +1,13 @@
---- dosfstools-3.0.9.orig/Makefile	2009-10-04 11:03:23.000000000 +0200
-+++ dosfstools-3.0.9/Makefile	2011-01-07 21:50:15.000000000 +0100
-@@ -29,7 +29,7 @@ OPTFLAGS = -O2 -fomit-frame-pointer $(sh
+--- dosfstools-3.0.26.orig/Makefile	2014-01-17 07:09:28.000000000 +0100
++++ dosfstools-3.0.26/Makefile	2014-03-13 08:58:52.000000000 +0100
+@@ -32,7 +32,9 @@ OPTFLAGS = -O2 -fomit-frame-pointer -D_G
  #WARNFLAGS = -Wall -pedantic -std=c99
- WARNFLAGS = -Wall
+ WARNFLAGS = -Wall -Wextra -Wno-sign-compare -Wno-missing-field-initializers -Wmissing-prototypes -Wstrict-prototypes
  DEBUGFLAGS = -g
 -CFLAGS += $(OPTFLAGS) $(WARNFLAGS) $(DEBUGFLAGS)
++CFLAGS ?=
 +CFLAGS += $(WARNFLAGS)
++LDLIBS = -liconv
  
  VPATH = src