svn commit: trunk/buildroot/package/util-linux

sjhill at uclibc.org sjhill at uclibc.org
Tue Oct 4 01:30:02 UTC 2005


Author: sjhill
Date: 2005-10-03 18:30:01 -0700 (Mon, 03 Oct 2005)
New Revision: 11746

Log:
This patch is necessary in order to build with gcc-4.1 compilers. Otherwise, you will get the error message of 'fsck.cramfs.c:98: error: variable-size type declared outside of any function'. I emailed the maintainer giving them a couple of different ways to fix the package, but I have not heard anything. He gets a 'L' for Lame. Anyway, I have hardcoded the PAGE_CACHE_SIZE (page size) to be 4096. Only alpha and the 64-bit platforms will have something different, or MIPS with its variable page size. Curse you MIPS.


Added:
   trunk/buildroot/package/util-linux/util-linux-gcc41.patch


Changeset:
Added: trunk/buildroot/package/util-linux/util-linux-gcc41.patch
===================================================================
--- trunk/buildroot/package/util-linux/util-linux-gcc41.patch	2005-10-04 00:46:31 UTC (rev 11745)
+++ trunk/buildroot/package/util-linux/util-linux-gcc41.patch	2005-10-04 01:30:01 UTC (rev 11746)
@@ -0,0 +1,28 @@
+diff -urN util-linux-2.12q/disk-utils/fsck.cramfs.c util-linux-2.12q-patched/disk-utils/fsck.cramfs.c
+--- util-linux-2.12q/disk-utils/fsck.cramfs.c	2004-12-11 08:53:16.000000000 -0600
++++ util-linux-2.12q-patched/disk-utils/fsck.cramfs.c	2005-10-03 17:27:13.000000000 -0500
+@@ -77,15 +77,7 @@
+ #define PAD_SIZE 512
+ 
+ #include <asm/page.h>
+-#ifdef PAGE_SIZE
+-#define PAGE_CACHE_SIZE ((int) PAGE_SIZE)
+-#elif defined __ia64__
+-#define PAGE_CACHE_SIZE (16384)
+-#elif defined __alpha__
+-#define PAGE_CACHE_SIZE (8192)
+-#else
+ #define PAGE_CACHE_SIZE (4096)
+-#endif
+ 
+ /* Guarantee access to at least 8kB at a time */
+ #define ROMBUFFER_BITS	13
+@@ -95,7 +87,7 @@
+ static unsigned long read_buffer_block = ~0UL;
+ 
+ /* Uncompressing data structures... */
+-static char outbuffer[PAGE_CACHE_SIZE*2];
++static char outbuffer[4096*2];
+ z_stream stream;
+ 
+ #endif /* INCLUDE_FS_TESTS */




More information about the uClibc-cvs mailing list