浏览代码

disable manpage and docs, fixes Darwin cross-compile

Waldemar Brodkorb 11 年之前
父节点
当前提交
d944fa8867

+ 1 - 1
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

+ 19 - 1
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; \

+ 2 - 2
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);

+ 2 - 2
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 
      }
  }