ehmry/genode
ehmry
/
genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libports: less noisy libext2fs compilation 

Fixes #1058.
This commit is contained in:
Josef Söntgen 2013-12-09 15:38:36 +01:00 committed by Christian Helmuth
parent 7bc49b05d0
commit 8f1e8c122f
12 changed files with 138 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libports/lib/mk/libext2fs.mk
View File

@ -12,7 +12,11 @@ INC_DIR += $(REP_DIR)/include/fuse-ext2 \
$(REP_DIR)/src/lib/fuse-ext2 \
$(ET_DIR)
CC_OPT += -DHAVE_CONFIG_H -D__BSD_VISIBLE
CC_OPT += -DHAVE_CONFIG_H -D__BSD_VISIBLE -DENABLE_DEBUG
CC_OPT += -Wno-unused-function -Wno-unused-variable \
-Wno-unused-but-set-variable -Wno-cpp \
-Wno-maybe-uninitialized -Wno-uninitialized
LIBS += libc

11
libports/src/lib/fuse-ext2/patches/com_err.c.patch Normal file
View File

@ -0,0 +1,11 @@
--- contrib/fuse-ext2-svn-220/e2fsprogs-1.41.12.newgit/et/com_err.c.orig 2013-12-09 15:25:01.855366466 +0100
+++ contrib/fuse-ext2-svn-220/e2fsprogs-1.41.12.newgit/et/com_err.c 2013-12-09 15:25:11.063366732 +0100
@@ -11,6 +11,8 @@
* express or implied warranty.
*/
+#include "config.h"
+
#include <stdio.h>
#ifdef HAVE_TERMIOS_H
#include <termios.h>

11
libports/src/lib/fuse-ext2/patches/error_message.c.patch Normal file
View File

@ -0,0 +1,11 @@
--- contrib/fuse-ext2-svn-220/e2fsprogs-1.41.12.newgit/et/error_message.c.orig 2013-12-09 15:26:26.847368923 +0100
+++ contrib/fuse-ext2-svn-220/e2fsprogs-1.41.12.newgit/et/error_message.c 2013-12-09 15:26:21.483368767 +0100
@@ -16,6 +16,8 @@
* express or implied warranty.
*/
+#include "config.h"
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>

20
libports/src/lib/fuse-ext2/patches/fuse-ext2.h.patch Normal file
View File

@ -0,0 +1,20 @@
--- contrib/fuse-ext2-svn-220/fuse-ext2/fuse-ext2.h.orig 2013-12-09 14:39:42.000000000 +0100
+++ contrib/fuse-ext2-svn-220/fuse-ext2/fuse-ext2.h 2013-12-09 14:33:19.455276804 +0100
@@ -88,7 +88,7 @@
static inline ext2_filsys current_ext2fs(void)
{
struct fuse_context *mycontext=fuse_get_context();
- struct extfs_data *e2data=mycontext->private_data;
+ struct extfs_data *e2data= (struct extfs_data*)mycontext->private_data;
time_t now=time(NULL);
if ((now - e2data->last_flush) > FLUSH_BITMAPS_TIMEOUT) {
ext2fs_write_bitmaps(e2data->e2fs);
@@ -103,7 +103,7 @@
{
va_list args;
struct fuse_context *mycontext=fuse_get_context();
- struct extfs_data *e2data=mycontext->private_data;
+ struct extfs_data *e2data=(struct extfs_data*) mycontext->private_data;
if (e2data && (e2data->debug == 0 || e2data->silent == 1)) {
return;
}

8
libports/src/lib/fuse-ext2/patches/gen_bitmap64.c.patch Normal file
View File

@ -0,0 +1,8 @@
--- contrib/fuse-ext2-svn-220/e2fsprogs-1.41.12.newgit/ext2fs/gen_bitmap64.c.orig 2013-12-09 15:23:27.407363737 +0100
+++ contrib/fuse-ext2-svn-220/e2fsprogs-1.41.12.newgit/ext2fs/gen_bitmap64.c 2013-12-09 15:23:21.847363577 +0100
@@ -577,4 +577,5 @@
com_err(0, EXT2_ET_MAGIC_GENERIC_BITMAP,
"called %s with 64-bit bitmap", func);
#endif
+ return 0;
}

11
libports/src/lib/fuse-ext2/patches/icount.c.patch Normal file
View File

@ -0,0 +1,11 @@
--- contrib/fuse-ext2-svn-220/e2fsprogs-1.41.12.newgit/ext2fs/icount.c.orig 2013-12-09 15:27:23.231370552 +0100
+++ contrib/fuse-ext2-svn-220/e2fsprogs-1.41.12.newgit/ext2fs/icount.c 2013-12-09 15:27:35.755370914 +0100
@@ -9,6 +9,8 @@
* %End-Header%
*/
+#include "config.h"
+
#if HAVE_UNISTD_H
#include <unistd.h>
#endif

11
libports/src/lib/fuse-ext2/patches/init_et.c.patch Normal file
View File

@ -0,0 +1,11 @@
--- contrib/fuse-ext2-svn-220/e2fsprogs-1.41.12.newgit/et/init_et.c.orig 2013-12-09 15:31:03.111376907 +0100
+++ contrib/fuse-ext2-svn-220/e2fsprogs-1.41.12.newgit/et/init_et.c 2013-12-09 15:31:11.391377147 +0100
@@ -16,6 +16,8 @@
* express or implied warranty.
*/
+#include "config.h"
+
#include <stdio.h>
#include <errno.h>
#ifdef HAVE_STDLIB_H

11
libports/src/lib/fuse-ext2/patches/res_gdt.c.patch Normal file
View File

@ -0,0 +1,11 @@
--- contrib/fuse-ext2-svn-220/e2fsprogs-1.41.12.newgit/ext2fs/res_gdt.c.orig 2013-12-09 15:17:10.771352852 +0100
+++ contrib/fuse-ext2-svn-220/e2fsprogs-1.41.12.newgit/ext2fs/res_gdt.c 2013-12-09 15:16:58.379352494 +0100
@@ -63,7 +63,7 @@
errcode_t retval, retval2;
struct ext2_super_block *sb;
struct ext2_inode inode;
- __u32 *dindir_buf, *gdt_buf;
+ __u32 *dindir_buf = 0, *gdt_buf;
unsigned long long apb, inode_size;
/* FIXME-64 - can't deal with extents */
blk_t dindir_blk, rsv_off, gdt_off, gdt_blk;

11
libports/src/lib/fuse-ext2/patches/rw_bitmaps.c.patch Normal file
View File

@ -0,0 +1,11 @@
--- contrib/fuse-ext2-svn-220/e2fsprogs-1.41.12.newgit/ext2fs/rw_bitmaps.c.orig 2013-12-09 15:17:28.255353356 +0100
+++ contrib/fuse-ext2-svn-220/e2fsprogs-1.41.12.newgit/ext2fs/rw_bitmaps.c 2013-12-09 15:21:02.807359558 +0100
@@ -34,7 +34,7 @@
int block_nbytes, inode_nbytes;
unsigned int nbits;
errcode_t retval;
- char *block_buf, *inode_buf;
+ char *block_buf = 0, *inode_buf = 0;
int csum_flag = 0;
blk64_t blk;
blk64_t blk_itr = fs->super->s_first_data_block;

17
libports/src/lib/fuse-ext2/patches/tdb.c.patch Normal file
View File

@ -0,0 +1,17 @@
--- contrib/fuse-ext2-svn-220/e2fsprogs-1.41.12.newgit/ext2fs/tdb.c.orig 2013-12-09 15:04:04.315330122 +0100
+++ contrib/fuse-ext2-svn-220/e2fsprogs-1.41.12.newgit/ext2fs/tdb.c 2013-12-09 15:05:19.767332303 +0100
@@ -75,12 +75,11 @@
static char *rep_strdup(const char *s)
{
char *ret;
- int length;
+ size_t length;
if (!s)
return NULL;
- if (!length)
- length = strlen(s);
+ length = strlen(s);
ret = malloc(length + 1);
if (ret) {

11
libports/src/lib/fuse-ext2/patches/test_io.c.patch Normal file
View File

@ -0,0 +1,11 @@
--- contrib/fuse-ext2-svn-220/e2fsprogs-1.41.12.newgit/ext2fs/test_io.c.orig 2013-12-09 15:32:11.095378871 +0100
+++ contrib/fuse-ext2-svn-220/e2fsprogs-1.41.12.newgit/ext2fs/test_io.c 2013-12-09 15:32:20.811379151 +0100
@@ -9,6 +9,8 @@
* %End-Header%
*/
+#include "config.h"
+
#include <stdio.h>
#include <string.h>
#if HAVE_UNISTD_H

11
libports/src/lib/fuse-ext2/patches/unix_io.c.patch Normal file
View File

@ -0,0 +1,11 @@
--- contrib/fuse-ext2-svn-220/e2fsprogs-1.41.12.newgit/ext2fs/unix_io.c.orig 2013-12-09 15:07:14.055335606 +0100
+++ contrib/fuse-ext2-svn-220/e2fsprogs-1.41.12.newgit/ext2fs/unix_io.c 2013-12-09 15:06:55.163335059 +0100
@@ -200,7 +200,7 @@
errcode_t retval;
size_t size, alignsize, fragment;
ext2_loff_t location;
- int total = 0, actual;
+ int total = 0, actual = 0;
#define BLOCKALIGN 512
char sector[BLOCKALIGN];