diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-05 13:56:09 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-05 15:52:21 +0200 |
| commit | d944fa88674123f429a06dca7ff588abf52671be (patch) | |
| tree | 20287793a79f7899804b26132ca31319ca3de102 | |
| parent | 4d15e451c95220f682e262d125ef3fba38ac44ed (diff) | |
disable manpage and docs, fixes Darwin cross-compile
| -rw-r--r-- | package/dosfstools/Makefile | 2 | ||||
| -rw-r--r-- | package/dosfstools/patches/patch-Makefile | 20 | ||||
| -rw-r--r-- | package/dosfstools/patches/patch-src_boot_c | 4 | ||||
| -rw-r--r-- | package/dosfstools/patches/patch-src_io_c | 4 |
4 files changed, 24 insertions, 6 deletions
diff --git a/package/dosfstools/Makefile b/package/dosfstools/Makefile index 531d82553..14a44bef3 100644 --- a/package/dosfstools/Makefile +++ b/package/dosfstools/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= dosfstools PKG_VERSION:= 3.0.26 -PKG_RELEASE:= 3 +PKG_RELEASE:= 4 PKG_MD5SUM:= 45012f5f56f2aae3afcd62120b9e5a08 PKG_DESCR:= utilities to create and check FAT filesystems PKG_SECTION:= fs diff --git a/package/dosfstools/patches/patch-Makefile b/package/dosfstools/patches/patch-Makefile index 1d127acbc..984244502 100644 --- a/package/dosfstools/patches/patch-Makefile +++ b/package/dosfstools/patches/patch-Makefile @@ -1,5 +1,5 @@ --- 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 ++++ dosfstools-3.0.26/Makefile 2014-05-05 13:38:09.000000000 +0200 @@ -32,7 +32,9 @@ OPTFLAGS = -O2 -fomit-frame-pointer -D_G #WARNFLAGS = -Wall -pedantic -std=c99 WARNFLAGS = -Wall -Wextra -Wno-sign-compare -Wno-missing-field-initializers -Wmissing-prototypes -Wstrict-prototypes @@ -11,3 +11,21 @@ VPATH = src +@@ -48,7 +50,7 @@ mkfs.fat: mkfs.fat.o + + rebuild: distclean build + +-install: install-bin install-doc install-man install-symlinks ++install: install-bin install-symlinks + + install-bin: build + install -d -m 0755 $(DESTDIR)/$(SBINDIR) +@@ -73,7 +75,7 @@ install-man: + install -D -m 0644 $${MANPAGE} $(DESTDIR)/$(MANDIR)/$${LANGUAGE}/man$${SECTION}/$$(basename $${MANPAGE} .$${LANGUAGE}.$${SECTION}).$${SECTION}; \ + done; \ + done +-install-symlinks: install-bin install-man ++install-symlinks: install-bin + if [ -e $(DESTDIR)/$(SBINDIR)/fatlabel ]; \ + then \ + ln -sf fatlabel $(DESTDIR)/$(SBINDIR)/dosfslabel; \ diff --git a/package/dosfstools/patches/patch-src_boot_c b/package/dosfstools/patches/patch-src_boot_c index cd2dd927d..ac5a155e4 100644 --- a/package/dosfstools/patches/patch-src_boot_c +++ b/package/dosfstools/patches/patch-src_boot_c @@ -1,5 +1,5 @@ --- dosfstools-3.0.26.orig/src/boot.c 2014-01-17 07:06:54.000000000 +0100 -+++ dosfstools-3.0.26/src/boot.c 2014-03-26 13:20:59.000000000 +0100 ++++ dosfstools-3.0.26/src/boot.c 2014-05-05 13:34:45.000000000 +0200 @@ -155,7 +155,7 @@ static void check_backup_boot(DOS_FS * f fs->backupboot_start = bbs * lss; b->backup_boot = htole16(bbs); @@ -66,7 +66,7 @@ int i; if (fs->root_cluster) { -@@ -525,7 +525,7 @@ static void write_volume_label(DOS_FS * +@@ -525,7 +525,7 @@ static void write_volume_label(DOS_FS * { time_t now = time(NULL); struct tm *mtime = localtime(&now); diff --git a/package/dosfstools/patches/patch-src_io_c b/package/dosfstools/patches/patch-src_io_c index fae1ce625..f8cd34142 100644 --- a/package/dosfstools/patches/patch-src_io_c +++ b/package/dosfstools/patches/patch-src_io_c @@ -1,5 +1,5 @@ --- dosfstools-3.0.26.orig/src/io.c 2014-01-17 07:07:14.000000000 +0100 -+++ dosfstools-3.0.26/src/io.c 2014-03-26 13:27:02.000000000 +0100 ++++ dosfstools-3.0.26/src/io.c 2014-05-05 13:34:45.000000000 +0200 @@ -48,7 +48,7 @@ typedef struct _change { @@ -39,7 +39,7 @@ { CHANGE *walk; int got; -@@ -145,7 +145,7 @@ void fs_read(loff_t pos, int size, void +@@ -145,7 +145,7 @@ void fs_read(loff_t pos, int size, void } } |