diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-13 10:01:18 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-13 10:01:18 +0100 |
| commit | 01c284ff8d0220f6c4c217415380f8e42fb3c71c (patch) | |
| tree | 99dbebcd46854b4dadf4a89ba8dddf07e146991f /package | |
| parent | 205689421db78e32622dc5eb2815fd12ed832510 (diff) | |
| parent | 607c3fcd1d10a37c077c870df450b5389fb519bf (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package')
| -rw-r--r-- | package/dosfstools/Makefile | 5 | ||||
| -rw-r--r-- | package/dosfstools/patches/patch-Makefile | 10 | ||||
| -rw-r--r-- | package/xfsprogs/Makefile | 3 |
3 files changed, 11 insertions, 7 deletions
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 diff --git a/package/xfsprogs/Makefile b/package/xfsprogs/Makefile index 78e30a09a..c06803164 100644 --- a/package/xfsprogs/Makefile +++ b/package/xfsprogs/Makefile @@ -9,8 +9,9 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= d6159f7a664d95b4c150d580399d4400 PKG_DESCR:= Utilities for XFS filesystems PKG_SECTION:= fs -PKG_BUILDDEP:= e2fsprogs util-linux +PKG_BUILDDEP:= e2fsprogs util-linux ncurses PKG_DEPENDS:= libuuid libpthread libblkid librt libgcc +PKG_DEPENDS+= libncurses PKG_URL:= http://oss.sgi.com/projects/xfs PKG_SITES:= ftp://oss.sgi.com/projects/xfs/cmd_tars/ \ ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/ |