From 5b03c6330ef063356668a328f5fd1b14848b0893 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 12 Mar 2014 18:21:55 +0100 Subject: update and fix packaging issue --- package/dosfstools/Makefile | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'package/dosfstools') diff --git a/package/dosfstools/Makefile b/package/dosfstools/Makefile index 9b6c365a1..2235e73af 100644 --- a/package/dosfstools/Makefile +++ b/package/dosfstools/Makefile @@ -4,13 +4,15 @@ include ${TOPDIR}/rules.mk PKG_NAME:= dosfstools -PKG_VERSION:= 3.0.9 -PKG_RELEASE:= 2 -PKG_MD5SUM:= bd273cf8aa6341c0b52cbac72050bcf4 -PKG_DESCR:= Utilities to create and check MS-DOS FAT filesystems +PKG_VERSION:= 3.0.26 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 45012f5f56f2aae3afcd62120b9e5a08 +PKG_DESCR:= utilities to create and check FAT filesystems PKG_SECTION:= fs PKG_URL:= http://www.daniel-baumann.ch/software/dosfstools/ -PKG_SITES:= http://www.daniel-baumann.ch/software/dosfstools/ +PKG_SITES:= http://daniel-baumann.ch/files/software/dosfstools/ + +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz include ${TOPDIR}/mk/package.mk @@ -19,11 +21,11 @@ $(eval $(call PKG_template,DOSFSTOOLS,dosfstools,${PKG_VERSION}-${PKG_RELEASE},$ CONFIG_STYLE:= manual XAKE_FLAGS+= PREFIX="" OPTFLAGS="-D_FILE_OFFSET_BITS=64" -post-install: +dosfstools-install: ${INSTALL_DIR} ${IDIR_DOSFSTOOLS}/sbin ${CP} ${WRKINST}/sbin/dosfsck ${IDIR_DOSFSTOOLS}/sbin/ - ${CP} ${WRKINST}/sbin/fsck.{msdos,vfat} ${IDIR_DOSFSTOOLS}/sbin/ + ${CP} ${WRKINST}/sbin/fsck.{msdos,vfat,fat} ${IDIR_DOSFSTOOLS}/sbin/ ${CP} ${WRKINST}/sbin/mkdosfs ${IDIR_DOSFSTOOLS}/sbin/ - ${CP} ${WRKINST}/sbin/mkfs.{msdos,vfat} ${IDIR_DOSFSTOOLS}/sbin/ + ${CP} ${WRKINST}/sbin/mkfs.{msdos,vfat,fat} ${IDIR_DOSFSTOOLS}/sbin/ include ${TOPDIR}/mk/pkg-bottom.mk -- cgit v1.2.3 From f42fb988bae9d402b0b204614b54ba9b4261d877 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 13 Mar 2014 08:59:58 +0100 Subject: fix linking with iconv --- package/dosfstools/Makefile | 5 +++-- package/dosfstools/patches/patch-Makefile | 10 ++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) (limited to 'package/dosfstools') diff --git a/package/dosfstools/Makefile b/package/dosfstools/Makefile index 2235e73af..1dd82182a 100644 --- a/package/dosfstools/Makefile +++ b/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 diff --git a/package/dosfstools/patches/patch-Makefile b/package/dosfstools/patches/patch-Makefile index c20b7f4dc..1d127acbc 100644 --- a/package/dosfstools/patches/patch-Makefile +++ b/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 -- cgit v1.2.3